summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Yao <ryao@gentoo.org>2012-05-29 10:42:37 +0000
committerRichard Yao <ryao@gentoo.org>2012-05-29 10:42:37 +0000
commit9d5cfb6b40a7e8847c983af297ee5cb744c7edf9 (patch)
tree2e8dc313ae4d4d2307be319254d44535cde999b8 /sys-libs/db
parentUpdate named.cache (diff)
downloadgentoo-2-9d5cfb6b40a7e8847c983af297ee5cb744c7edf9.tar.gz
gentoo-2-9d5cfb6b40a7e8847c983af297ee5cb744c7edf9.tar.bz2
gentoo-2-9d5cfb6b40a7e8847c983af297ee5cb744c7edf9.zip
Rename __atomic_compare_exchange to avoid conflict with builtin, bug #417547, approved by Chainsaw in IRC
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs/db')
-rw-r--r--sys-libs/db/ChangeLog8
-rw-r--r--sys-libs/db/db-5.0.21-r1.ebuild3
-rw-r--r--sys-libs/db/db-5.0.26.ebuild3
-rw-r--r--sys-libs/db/db-5.0.32.ebuild3
4 files changed, 13 insertions, 4 deletions
diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index bfc9ccb0f9fe..1c94a848a891 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,12 @@
# 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.328 2012/05/29 08:18:33 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.329 2012/05/29 10:42:37 ryao Exp $
+
+ 29 May 2012; Richard Yao <ryao@gentoo.org> db-5.0.21-r1.ebuild,
+ db-5.0.26.ebuild, db-5.0.32.ebuild, db-5.1.19-r2.ebuild, db-5.1.25.ebuild,
+ db-5.1.29.ebuild, db-5.2.28.ebuild, db-5.2.36.ebuild:
+ Rename __atomic_compare_exchange to avoid conflict with builtin, bug #417547,
+ approved by Chainsaw in IRC
29 May 2012; Richard Yao <ryao@gentoo.org>
+files/db-4.8.30-rename-atomic-compare-exchange.patch, db-4.8.30.ebuild:
diff --git a/sys-libs/db/db-5.0.21-r1.ebuild b/sys-libs/db/db-5.0.21-r1.ebuild
index f4f22a0744e0..dd7144ea001b 100644
--- a/sys-libs/db/db-5.0.21-r1.ebuild
+++ b/sys-libs/db/db-5.0.21-r1.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-5.0.21-r1.ebuild,v 1.4 2012/05/24 05:34:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.0.21-r1.ebuild,v 1.5 2012/05/29 10:42:37 ryao Exp $
EAPI=2
inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib
@@ -51,6 +51,7 @@ src_prepare() {
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/db-5.0.26.ebuild b/sys-libs/db/db-5.0.26.ebuild
index 92e324428ec3..110fa28b9439 100644
--- a/sys-libs/db/db-5.0.26.ebuild
+++ b/sys-libs/db/db-5.0.26.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-5.0.26.ebuild,v 1.3 2012/05/24 05:34:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.0.26.ebuild,v 1.4 2012/05/29 10:42:37 ryao Exp $
EAPI=2
inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib
@@ -51,6 +51,7 @@ src_prepare() {
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/db-5.0.32.ebuild b/sys-libs/db/db-5.0.32.ebuild
index cf6aa575337b..958fde28f610 100644
--- a/sys-libs/db/db-5.0.32.ebuild
+++ b/sys-libs/db/db-5.0.32.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-5.0.32.ebuild,v 1.3 2012/05/24 05:34:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.0.32.ebuild,v 1.4 2012/05/29 10:42:37 ryao Exp $
EAPI=2
inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib
@@ -51,6 +51,7 @@ src_prepare() {
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