diff options
| author |   Richard Yao <ryao@gentoo.org> | 2012-05-29 08:18:33 +0000 |
|---|---|---|
| committer | Richard Yao <ryao@gentoo.org> | 2012-05-29 08:18:33 +0000 |
| commit | 32a061fcf210b607fd8d869429f19448aa0d2a8a (patch) | |
| tree | 8c27ea288e2563b7892df60d7772292050285a72 /sys-libs | |
| parent | Incorporate gcc-4.7 fixes and a better patch for system-cairo support (diff) | |
| download | gentoo-2-32a061fcf210b607fd8d869429f19448aa0d2a8a.tar.gz gentoo-2-32a061fcf210b607fd8d869429f19448aa0d2a8a.tar.bz2 gentoo-2-32a061fcf210b607fd8d869429f19448aa0d2a8a.zip | |
Rename __atomic_compare_exchange to avoid conflict with builtin, bug #417547, Chainsaw approved
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/db/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-libs/db/db-4.8.30.ebuild | 3 | ||||
| -rw-r--r-- | sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch | 22 |
3 files changed, 30 insertions, 2 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/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; |