Fix compilation with gcc-4.2, bug #185602.

Package-Manager: portage-2.1.3.9

4 files changed, 45 insertions, 14 deletions

diff --git a/net-dns/pdns-recursor/ChangeLog b/net-dns/pdns-recursor/ChangeLog
index 54577c3aab53..3f839015e601 100644
--- a/net-dns/pdns-recursor/ChangeLog
+++ b/net-dns/pdns-recursor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/pdns-recursor
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/ChangeLog,v 1.13 2007/06/08 22:28:14 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/ChangeLog,v 1.14 2007/09/22 19:34:04 swegener Exp $
+
+  22 Sep 2007; Sven Wegener <swegener@gentoo.org>
+  +files/pdns-recursor-3.1.4-gcc42.patch, pdns-recursor-3.1.4.ebuild:
+  Fix compilation with gcc-4.2, bug #185602.
 
   08 Jun 2007; Sven Wegener <swegener@gentoo.org>
   +files/pdns-recursor-3.1.4-chdir.patch,
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 8c9b5d2cc731..2fdbc73da929 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -5,6 +5,10 @@ AUX pdns-recursor-3.1.4-chdir.patch 564 RMD160 c5bc904a0acb653c1606778188f10f932
 MD5 d8ecaa8b6db40006487d5fb81dbb4ce0 files/pdns-recursor-3.1.4-chdir.patch 564
 RMD160 c5bc904a0acb653c1606778188f10f93294970d9 files/pdns-recursor-3.1.4-chdir.patch 564
 SHA256 3c0b38f7db7c776c71af0b2a0e65d06d17c652b383a074dd22b25fada8687934 files/pdns-recursor-3.1.4-chdir.patch 564
+AUX pdns-recursor-3.1.4-gcc42.patch 545 RMD160 3ee1fcc65e7f97eb83a6d003c89706ba2196d78c SHA1 84a47380c2c3007400b696aa2a09f97ef2f9a371 SHA256 a9322b3894298f89f5bd2bddc037a23378b7f9cfc4883ad0720bf041d0b83f93
+MD5 c5e75a369954e574f6d4d9a14290fe9e files/pdns-recursor-3.1.4-gcc42.patch 545
+RMD160 3ee1fcc65e7f97eb83a6d003c89706ba2196d78c files/pdns-recursor-3.1.4-gcc42.patch 545
+SHA256 a9322b3894298f89f5bd2bddc037a23378b7f9cfc4883ad0720bf041d0b83f93 files/pdns-recursor-3.1.4-gcc42.patch 545
 AUX pdns-recursor-3.1.4-statedir.patch 408 RMD160 2236abcd6191658be23774d740c593e0b36d9ad0 SHA1 a21a8a43ab467f9207a527d0dab8998dc9d1609d SHA256 2a8961e4891d64399fb96c5813d823fd001c1e092b130a7b963bc8462720628a
 MD5 04c4b7bae34689aa83544ce0020e719c files/pdns-recursor-3.1.4-statedir.patch 408
 RMD160 2236abcd6191658be23774d740c593e0b36d9ad0 files/pdns-recursor-3.1.4-statedir.patch 408
@@ -18,14 +22,14 @@ MD5 a3743478ef0877353bec730d4e0c11aa files/recursor.conf 452
 RMD160 6708700e955dd29041e360d5f0a68c9d3293d665 files/recursor.conf 452
 SHA256 b36b3310a26785d5e8a38c03bce9afcf8a08e321a81ee385e9557dcaa3957255 files/recursor.conf 452
 DIST pdns-recursor-3.1.4.tar.bz2 139191 RMD160 0c71b6817a274d85424164bfb88c482edff144b4 SHA1 d1fa344ec5f2feb12397361f92b011a0cb726d48 SHA256 9975ec73e311bda4c22f302f18f4ed4fe701d63bce3155f300ccc561d5b0cc39
-EBUILD pdns-recursor-3.1.4.ebuild 1225 RMD160 cddb1bd3166be5a754d3da55009564821597071e SHA1 bf4d6f062cb2a6d5eff086a9969b5c1ef6da74a7 SHA256 f52df4eea76fa5cf3715932567b327ad6356907c3968e0fc9241df54925f2718
-MD5 7528542ffec9327639ee79808d882413 pdns-recursor-3.1.4.ebuild 1225
-RMD160 cddb1bd3166be5a754d3da55009564821597071e pdns-recursor-3.1.4.ebuild 1225
-SHA256 f52df4eea76fa5cf3715932567b327ad6356907c3968e0fc9241df54925f2718 pdns-recursor-3.1.4.ebuild 1225
-MISC ChangeLog 2434 RMD160 89db75a1a1c626090aeee9d822042aee3b46bd11 SHA1 f0c3cdd6105051c730ce478afe1a7f9edce4cbf7 SHA256 4a014a843d9125d738bcb2faeda0748e56cb889a6c46456e846388d9ea4c77db
-MD5 45972a3211f4a0d75efee5033feb4c47 ChangeLog 2434
-RMD160 89db75a1a1c626090aeee9d822042aee3b46bd11 ChangeLog 2434
-SHA256 4a014a843d9125d738bcb2faeda0748e56cb889a6c46456e846388d9ea4c77db ChangeLog 2434
+EBUILD pdns-recursor-3.1.4.ebuild 1264 RMD160 1bd557d86f691988b160d6008a2d6eb189c351ca SHA1 14fa07ceae5bc7365fd6fe920b950ab140eb8521 SHA256 4eba888e598ab95915298e9af8e614f3b7f39e80e2acdb2ee39c3152d39df54b
+MD5 c98cadcc783188dee35d2642838405a4 pdns-recursor-3.1.4.ebuild 1264
+RMD160 1bd557d86f691988b160d6008a2d6eb189c351ca pdns-recursor-3.1.4.ebuild 1264
+SHA256 4eba888e598ab95915298e9af8e614f3b7f39e80e2acdb2ee39c3152d39df54b pdns-recursor-3.1.4.ebuild 1264
+MISC ChangeLog 2600 RMD160 9a81a18fcda88631c9953468bd30b4883f26513c SHA1 bea29c1eeead1e49d91e4b901dc67b885f6e9dbe SHA256 9625e29270caa2b3702b6499b6e04a340f3b2d292708179286e530675ea750ff
+MD5 f4ddb8ae4ea2db1d325f0f6e898dec72 ChangeLog 2600
+RMD160 9a81a18fcda88631c9953468bd30b4883f26513c ChangeLog 2600
+SHA256 9625e29270caa2b3702b6499b6e04a340f3b2d292708179286e530675ea750ff ChangeLog 2600
 MISC metadata.xml 837 RMD160 2622852a4345606d2ffe85a68f50f332a1dbd696 SHA1 4b574c68576b1c058956085df7a07e250361455c SHA256 742f9fd882ba627c0a7b26dff7fe7b439b8ccf728a1394725bbd85f2a28a7d4b
 MD5 5fd39b9552a8c80d492e32bba6cffda0 metadata.xml 837
 RMD160 2622852a4345606d2ffe85a68f50f332a1dbd696 metadata.xml 837
@@ -34,9 +38,9 @@ MD5 e3a9d8066b97ed39d65c1d13b934316d files/digest-pdns-recursor-3.1.4 262
 RMD160 dbde2237f2e112f64d2113f7dbc4ee10464f4010 files/digest-pdns-recursor-3.1.4 262
 SHA256 d6e9cba91bea306d197feecbe88e5a4504a9aaa4d2e6275e49851d75eaf30f08 files/digest-pdns-recursor-3.1.4 262
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFGbZ7UI1lqEGTUzyQRAsgeAJ0b0S5ssDkeE/Ylf39SnquIzR+7XACgtltf
-1qdgbJgbu5QELP9ht9Agm9k=
-=viBv
+iD8DBQFG9W4xI1lqEGTUzyQRAmyXAKCHsAZ4a49wu6/usT21n84lm2KpQwCeI7Qh
+mBV3WDmtXq+iTywm2ftTHdQ=
+=qvXW
 -----END PGP SIGNATURE-----
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-3.1.4-gcc42.patch b/net-dns/pdns-recursor/files/pdns-recursor-3.1.4-gcc42.patch
new file mode 100644
index 000000000000..f20d25baa19a
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor-3.1.4-gcc42.patch
@@ -0,0 +1,22 @@
+--- pdns/recursor_cache.cc
++++ pdns/recursor_cache.cc
+@@ -11,7 +11,10 @@
+ #include "config.h"
+ 
+ #ifdef GCC_SKIP_LOCKING
+-#include <bits/atomicity.h>
++#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))
++# include <ext/atomicity.h>
++#else
++# include <bits/atomicity.h>
+ // This code is ugly but does speedup the recursor tremendously on multi-processor systems, and even has a large effect (20, 30%) on uniprocessor 
+ namespace __gnu_cxx
+ {
+@@ -32,6 +35,7 @@
+   }
+ }
+ #endif
++#endif
+ 
+ string simpleCompress(const string& label)
+ {
diff --git a/net-dns/pdns-recursor/pdns-recursor-3.1.4.ebuild b/net-dns/pdns-recursor/pdns-recursor-3.1.4.ebuild
index 3de33a6f8810..a780a638bfc4 100644
--- a/net-dns/pdns-recursor/pdns-recursor-3.1.4.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-3.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/pdns-recursor-3.1.4.ebuild,v 1.5 2007/06/11 19:13:10 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/pdns-recursor-3.1.4.ebuild,v 1.6 2007/09/22 19:34:04 swegener Exp $
 
 inherit toolchain-funcs flag-o-matic eutils
 
@@ -23,6 +23,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${P}-statedir.patch
 	epatch "${FILESDIR}"/${P}-chdir.patch
+	epatch "${FILESDIR}"/${P}-gcc42.patch
 }
 
 src_compile() {