[gentoo-commits] repo/gentoo:master commit in: sys-libs/db/

[Mike Frysinger]

commit:     db548619f2d5a39f8bb523c60e99d20cf84ef513
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 28 20:22:45 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 20:25:53 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db548619

sys-libs/db: move -Wl,--default-symver back after tc-ld-is-gold #566942

The GNU gold test will fail if given invalid linker flags, so make sure
we test for it before adding various linker flags (that assume bfd).

 sys-libs/db/db-4.8.30-r2.ebuild | 16 ++++++----------
 sys-libs/db/db-5.3.28-r2.ebuild | 16 ++++++----------
 sys-libs/db/db-6.0.30-r1.ebuild | 16 ++++++----------
 sys-libs/db/db-6.0.35.ebuild    | 16 ++++++----------
 sys-libs/db/db-6.1.26.ebuild    | 16 ++++++----------
 5 files changed, 30 insertions(+), 50 deletions(-)

diff --git a/sys-libs/db/db-4.8.30-r2.ebuild b/sys-libs/db/db-4.8.30-r2.ebuild
index abb91de..e556706 100644
--- a/sys-libs/db/db-4.8.30-r2.ebuild
+++ b/sys-libs/db/db-4.8.30-r2.ebuild
@@ -88,16 +88,6 @@ src_prepare() {
 		-e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" configure || die
 }
 
-src_configure() {
-	# Add linker versions to the symbols. Easier to do, and safer than header file
-	# mumbo jumbo.
-	if use userland_GNU ; then
-		append-ldflags -Wl,--default-symver
-	fi
-
-	multilib-minimal_src_configure
-}
-
 multilib_src_configure() {
 	local myconf=()
 
@@ -110,6 +100,12 @@ multilib_src_configure() {
 		is-flagq -O[s123] || append-flags -O2
 	fi
 
+	# Add linker versions to the symbols. Easier to do, and safer than header file
+	# mumbo jumbo.
+	if use userland_GNU ; then
+		append-ldflags -Wl,--default-symver
+	fi
+
 	# use `set` here since the java opts will contain whitespace
 	if multilib_is_native_abi && use java ; then
 		myconf+=(

diff --git a/sys-libs/db/db-5.3.28-r2.ebuild b/sys-libs/db/db-5.3.28-r2.ebuild
index fa3f8d6..937d045 100644
--- a/sys-libs/db/db-5.3.28-r2.ebuild
+++ b/sys-libs/db/db-5.3.28-r2.ebuild
@@ -103,16 +103,6 @@ src_prepare() {
 	done
 }
 
-src_configure() {
-	# Add linker versions to the symbols. Easier to do, and safer than header file
-	# mumbo jumbo.
-	if use userland_GNU ; then
-		append-ldflags -Wl,--default-symver
-	fi
-
-	multilib-minimal_src_configure
-}
-
 multilib_src_configure() {
 	local myconf=()
 
@@ -125,6 +115,12 @@ multilib_src_configure() {
 		is-flagq -O[s123] || append-flags -O2
 	fi
 
+	# Add linker versions to the symbols. Easier to do, and safer than header file
+	# mumbo jumbo.
+	if use userland_GNU ; then
+		append-ldflags -Wl,--default-symver
+	fi
+
 	# use `set` here since the java opts will contain whitespace
 	if multilib_is_native_abi && use java ; then
 		myconf+=(

diff --git a/sys-libs/db/db-6.0.30-r1.ebuild b/sys-libs/db/db-6.0.30-r1.ebuild
index 64433d2..8192bec 100644
--- a/sys-libs/db/db-6.0.30-r1.ebuild
+++ b/sys-libs/db/db-6.0.30-r1.ebuild
@@ -104,16 +104,6 @@ src_prepare() {
 	done
 }
 
-src_configure() {
-	# Add linker versions to the symbols. Easier to do, and safer than header file
-	# mumbo jumbo.
-	if use userland_GNU ; then
-		append-ldflags -Wl,--default-symver
-	fi
-
-	multilib-minimal_src_configure
-}
-
 multilib_src_configure() {
 	local myconf=()
 
@@ -126,6 +116,12 @@ multilib_src_configure() {
 		is-flagq -O[s123] || append-flags -O2
 	fi
 
+	# Add linker versions to the symbols. Easier to do, and safer than header file
+	# mumbo jumbo.
+	if use userland_GNU ; then
+		append-ldflags -Wl,--default-symver
+	fi
+
 	# use `set` here since the java opts will contain whitespace
 	if multilib_is_native_abi && use java ; then
 		myconf+=(

diff --git a/sys-libs/db/db-6.0.35.ebuild b/sys-libs/db/db-6.0.35.ebuild
index 357f5ac..6fcfe90 100644
--- a/sys-libs/db/db-6.0.35.ebuild
+++ b/sys-libs/db/db-6.0.35.ebuild
@@ -104,16 +104,6 @@ src_prepare() {
 	done
 }
 
-src_configure() {
-	# Add linker versions to the symbols. Easier to do, and safer than header file
-	# mumbo jumbo.
-	if use userland_GNU ; then
-		append-ldflags -Wl,--default-symver
-	fi
-
-	multilib-minimal_src_configure
-}
-
 multilib_src_configure() {
 	local myconf=()
 
@@ -126,6 +116,12 @@ multilib_src_configure() {
 		is-flagq -O[s123] || append-flags -O2
 	fi
 
+	# Add linker versions to the symbols. Easier to do, and safer than header file
+	# mumbo jumbo.
+	if use userland_GNU ; then
+		append-ldflags -Wl,--default-symver
+	fi
+
 	# use `set` here since the java opts will contain whitespace
 	if multilib_is_native_abi && use java ; then
 		myconf+=(

diff --git a/sys-libs/db/db-6.1.26.ebuild b/sys-libs/db/db-6.1.26.ebuild
index 22cf36f..4e9a232 100644
--- a/sys-libs/db/db-6.1.26.ebuild
+++ b/sys-libs/db/db-6.1.26.ebuild
@@ -104,16 +104,6 @@ src_prepare() {
 	done
 }
 
-src_configure() {
-	# Add linker versions to the symbols. Easier to do, and safer than header file
-	# mumbo jumbo.
-	if use userland_GNU ; then
-		append-ldflags -Wl,--default-symver
-	fi
-
-	multilib-minimal_src_configure
-}
-
 multilib_src_configure() {
 	local myconf=()
 
@@ -126,6 +116,12 @@ multilib_src_configure() {
 		is-flagq -O[s123] || append-flags -O2
 	fi
 
+	# Add linker versions to the symbols. Easier to do, and safer than header file
+	# mumbo jumbo.
+	if use userland_GNU ; then
+		append-ldflags -Wl,--default-symver
+	fi
+
 	# use `set` here since the java opts will contain whitespace
 	if multilib_is_native_abi && use java ; then
 		myconf+=(