Rename __atomic_compare_exchange to avoid conflict with builtin, bug #417547, Chainsaw approved

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 33 insertions, 24 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 9f2ad7521629..bfc9ccb0f9fe 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.327 2012/05/24 05:34:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.328 2012/05/29 08:18:33 ryao Exp $
+
+  29 May 2012; Richard Yao <ryao@gentoo.org>
+  +files/db-4.8.30-rename-atomic-compare-exchange.patch, db-4.8.30.ebuild:
+  Rename __atomic_compare_exchange to avoid conflict with builtin, bug #417547,
+  Chainsaw approved
 
   24 May 2012; Mike Frysinger <vapier@gentoo.org> db-1.85-r3.ebuild,
   db-3.2.9_p2.ebuild, db-4.2.52_p5-r1.ebuild, db-4.2.52_p5.ebuild,
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 7ae125339d12..d08df87aefa7 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX db-1.85-gentoo-paths.patch 684 RMD160 cbfb484127600e180eb432d3f5aa31deba43e8bf SHA1 42a105f2503315a28b1e7f7aad71ee3bd4a56a13 SHA256 049052c74c544ac1c1f3b1b91c3e43df76b135c610148212679dfd324470cf2f
 AUX db-3.2.9-fix-dep-link.patch 1005 RMD160 71f4c2255cc6afffc494341ecd6352a6c754c006 SHA1 437f0eb7c82c0a2b8e7c2cdadddbd889d2735a97 SHA256 57e6f13170db99ba7f2f43aa0c7606085d25094127c63a48b76333c1289f6382
 AUX db-3.2.9-gcc43.patch 441 RMD160 90de42fc7b06e1f92f389b17d1af88da44b36b4d SHA1 7c42a4cba6cbd3ae75c306a5ed9090162f719c49 SHA256 102ac694f32719deabbefdcfbecd96a255b8a6cdc312095fb537cf99ca6b9d77
@@ -27,6 +24,7 @@ AUX db-4.6-jni-check-prefix-first.patch 1172 RMD160 5fe466cce625157517a8e703c3e0
 AUX db-4.6-libtool.patch 1817 RMD160 989536933036b8ea7d4bf55420c49ebad76d703b SHA1 830fc6ecaf948dc1276ee0a539668d6f2e9c9a15 SHA256 7b47ab059b5e9a775e024f6f2562eea136e870a32748675664e5a5315b871b21
 AUX db-4.8-libtool.patch 2076 RMD160 e92a09df1944c5054220c3467c4d3fe558928575 SHA1 af4faf7c990ad85dea0c3e651c8b7a0d0be7078d SHA256 b337c02ffc540e2d692ec57fe093d182f0054a673e5267eabd2db24121486312
 AUX db-4.8.24-java-manifest-location.patch 592 RMD160 8822d3b058f542414b46cdc63e7074ddb8a4a845 SHA1 12f7d6d56d180628d53fc00046f1c2a23b7fd67c SHA256 1589885b89ff465fe752c3062e322638a39ccf1a96c392473c5424cfcc628aea
+AUX db-4.8.30-rename-atomic-compare-exchange.patch 836 RMD160 47918dd167722ece417a174003bbc64c959ce13c SHA1 c3c8c9b00ed797c7bd86cdc672fa4ce2e44c94b7 SHA256 8efa8b37d4dbcbeb73592472be493f23c999616469dda88c6832b9d25f00b813
 AUX db-5.0.21-enable-dbm-autoconf.patch 1757 RMD160 db8cafeda220734e2436bbd2ff51850e291a7160 SHA1 6c82c0b1c9fbfb492349795d9263ac8cc26cad26 SHA256 e4868b2cbdfc881d9822d354e873727bbd824c3aa09c60dd6d6d8102c2bc1323
 AUX db-5.2.28-sqlite-configure-path.patch 906 RMD160 77b713bce4278f2380af01910794f7fc66a11e29 SHA1 eb6065ad86706f943a372f065a5f567adbcb8a73 SHA256 94e36064e3414d644cc1a157c011a80fdf28df66b0da4b7df69d078735d152fe
 DIST db-1.85-r3.1.patch.bz2 14641 RMD160 463c9d6cf013b28ff2c364d3f2ced378b334fea3 SHA1 95d36410f0fee98f192eee04c2a1f74cac106270 SHA256 88e3095b191fe425d0192d052595ab838ad4ef6324aac0a9e338fd6df7ae40d4
@@ -87,7 +85,7 @@ EBUILD db-4.7.25_p3.ebuild 4076 RMD160 9fe81f756d490e76c99448cf2cf977882341f1f6
 EBUILD db-4.7.25_p4.ebuild 4344 RMD160 e0a2f96b392f9e9072bad982c39cf0d03fa58498 SHA1 10140e4a88ac412756f96f7bc8c520c29aca32d5 SHA256 dc1bd98a8f54222793573674c553e6e7c6edc4b31c32242dbdcf54735eaf5d50
 EBUILD db-4.8.24.ebuild 4419 RMD160 acafc7df1a7cf5805d3961e9cd0f0e68ed4241d0 SHA1 e8ba7f52536bc5f4a0bef194283e01ff5fbcfb71 SHA256 c3b8aa780eb8c872b5b7d4f48e690a36acd79708cc01217f9af86f7c5cb43476
 EBUILD db-4.8.26.ebuild 4419 RMD160 91a01a44a30c4d1f1103744b261116d114b843cf SHA1 7f97346d8fc601e19ce4609d4c79199b3e5288b5 SHA256 22ed0ea538d9e53835ef0ce1215fbe5bb113fcde295c80754950d89050c5f28b
-EBUILD db-4.8.30.ebuild 4434 RMD160 06a158594c564c2b6e69fec1277e19644b777548 SHA1 4d7ece711fca7fba0d82ad76f15b2950a206d656 SHA256 57a6f29251e90d9e955a752014ae64912f641b5eb82049c35bfec3205c5eae57
+EBUILD db-4.8.30.ebuild 4504 RMD160 aaa80dae282f7f7bdff32c01dffb427b8792181e SHA1 50d7dc43350d14413e9a3b38a84373de3f44d54f SHA256 8f439b77d764f9abb87439f5b3617cb6c30a92a2fb8432ff8a181290f7831ac5
 EBUILD db-5.0.21-r1.ebuild 5354 RMD160 64ae4d70feb17c5140dc0cab6e2bba4f774ac289 SHA1 84fb41945c1fe53a28d02bec417b7de62b9d8162 SHA256 6ed4e2d1a28405b250eb4caa7fda7887c125561de7fddf834874788e5fa8fb7a
 EBUILD db-5.0.26.ebuild 5381 RMD160 5778a92c140b8d94abee73b04a788369d8eca71d SHA1 a8f27f3edc2de84a35ddd1fe9de65f7ca6a7be9c SHA256 77ae2287005524557e99830234fc6597c1fa5039592c8a281f1d5cac77dbef33
 EBUILD db-5.0.32.ebuild 5381 RMD160 3e4a21475ffcde85ef4f10cbae3f5e82c9f928ce SHA1 b3a1a4f6589500dd806ffcac345a9cc0fff3b83a SHA256 20834282de9185a6b2c751301b8b33fca6d4fec3035122b1632abe464cae74a6
@@ -96,22 +94,5 @@ EBUILD db-5.1.25.ebuild 5385 RMD160 143b394749613b1a0135fc3ef56579065bb9f1d3 SHA
 EBUILD db-5.1.29.ebuild 5385 RMD160 23a914443934b10a1e451a899d817455ef89f1b9 SHA1 a573f1d0375d8b06187497157976d7b96fb5e6be SHA256 d8746b7d870fb756b1825d60cdcb872725b48ea7fa386ac92e8b545e0f903a93
 EBUILD db-5.2.28.ebuild 6010 RMD160 2433e42258abe25ca388ea667537e109ee1d8764 SHA1 f8a6bc47de6a0ffdcfcef2d44b1932a35ef31d23 SHA256 30a87f7b4f1332c1e6e9c15d53d35a4835b3814252850d3715f30d63e0428a11
 EBUILD db-5.2.36.ebuild 6054 RMD160 43cc6fa705b20e742e7290bc1035fc267f675a94 SHA1 e9e11ba35f520326902b3e8eaba6f3253bb644ef SHA256 dea99747487675a3690c491df4e3150b197c1191e2e8ae5241b2e0096db011ea
-MISC ChangeLog 51718 RMD160 c38d4857a07262166ba11862692b4b32a4bdf1cf SHA1 66fb0d75f52dde6de12b65bca6b3305148f62814 SHA256 3cf70dad65c7f980d1d129d00e916f13aa2b84358c51b6e010c4a775ac828a30
+MISC ChangeLog 51937 RMD160 63e82b127a21b545ef21c87bc3cd6876b82de5c0 SHA1 3f68a85edbfbd4ff37cd2d6d441e0ffc8f3688b9 SHA256 be066793480a17ee073cc6aa0b1e9e4f73768dfa5e9bae61a8612518035ef32c
 MISC metadata.xml 1168 RMD160 dcaba4275b361b44688c96f02c7ea33c72d28b8d SHA1 e106f27f2b703e466104d32e8dff9e35d61fdbd4 SHA256 bd0ee61f698eeb5acb14af9a454d28d932d0bde8d1f3223614542b8ba2a74950
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBAgAGBQJPvcjTAAoJELEHsLL7fEFW9ksQAKmWfkn8kv2f4VOmTs+HWVO4
-y3s60bk/Paeh0bCRSuTphOomaqeutU2frfniuwQegeyiNlpSga9NYp4C8S9B5lCz
-uLCawIGErdPj84767peIjMFl9UvSPeqKech9JAAjU2Ju1qC/WBGJN17W1R7aW6iM
-MaqZEVvtwPiUsoeFORot2DigYl5oPP/IlZQQg21jS5wvd1GG0NyPocQuO5qFG6Vv
-t0Lrdg6ERF6602InxQkCH8Ps15Z178bYSDdyQ3yv25C8ObT4yB3N+wHEM9VleJl+
-udXs55xJTv7HGawFpU2883HRZdrZpppFqjjJy3uLnXUH4l51in0wyq+Bz0vo05vd
-jrDuaQhvs+F+ZR4ZUMqkz/HJDG9C/EHccatM4ARb4FiWFrMXKVTVFTjSG9ssp4Sk
-5zQmqBoiei2DZ/XDQhCyDzfHZMBoX82ezdpbh2HlrImqFl6s9o4u44XaqPCu8e3s
-TKJQbYrG88TOxj0IpiouM000lSy/vKUM+2DkERYE+W6R7fTQhqFbxdDl4bmMqmdl
-FBnbjUH8i+UNjyalYW8KS6mDQD9CuPM9FLum0FhdpmpGsoJdb1nxph9IoBZbMcrq
-RYwZAMHLdZcAiSWvbTRXHjGWiNQ00joC+0EdIaWHjF0Inp/3PPQT9hjeLLOQkVyv
-YeLxc3vUbl4bVUrVJ1oQ
-=Iabk
------END PGP SIGNATURE-----
diff --git a/sys-libs/db/db-4.8.30.ebuild b/sys-libs/db/db-4.8.30.ebuild
index e5850fae3484..203f89947ac9 100644
--- a/sys-libs/db/db-4.8.30.ebuild
+++ b/sys-libs/db/db-4.8.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.8.30.ebuild,v 1.8 2012/05/24 05:34:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.8.30.ebuild,v 1.9 2012/05/29 08:18:33 ryao Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib
 
@@ -46,6 +46,7 @@ src_unpack() {
 	done
 	epatch "${FILESDIR}"/${PN}-4.8-libtool.patch
 	epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
+	epatch "${FILESDIR}"/${PN}-4.8.30-rename-atomic-compare-exchange.patch
 
 	# use the includes from the prefix
 	epatch "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
diff --git a/sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch b/sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch
new file mode 100644
index 000000000000..c53160a82970
--- /dev/null
+++ b/sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch
@@ -0,0 +1,22 @@
+diff --git a/dbinc/atomic.h b/dbinc/atomic.h
+index 0034dcc..fa7ba93 100644
+--- a/dbinc/atomic.h
++++ b/dbinc/atomic.h
+@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val;
+ #define	atomic_inc(env, p)	__atomic_inc(p)
+ #define	atomic_dec(env, p)	__atomic_dec(p)
+ #define	atomic_compare_exchange(env, p, o, n)	\
+-	__atomic_compare_exchange((p), (o), (n))
++	__db_atomic_compare_exchange((p), (o), (n))
+ static inline int __atomic_inc(db_atomic_t *p)
+ {
+ 	int	temp;
+@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p)
+  * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html
+  * which configure could be changed to use.
+  */
+-static inline int __atomic_compare_exchange(
++static inline int __db_atomic_compare_exchange(
+ 	db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
+ {
+ 	atomic_value_t was;