From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A76161384B4 for ; Sat, 28 Nov 2015 20:26:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E22F21C06C; Sat, 28 Nov 2015 20:26:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AA27F21C06C for ; Sat, 28 Nov 2015 20:26:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0B35E33D3D0 for ; Sat, 28 Nov 2015 20:26:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F1DB4A4A for ; Sat, 28 Nov 2015 20:26:02 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1448742353.db548619f2d5a39f8bb523c60e99d20cf84ef513.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/db/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/db/db-4.8.30-r2.ebuild sys-libs/db/db-5.3.28-r2.ebuild sys-libs/db/db-6.0.30-r1.ebuild sys-libs/db/db-6.0.35.ebuild sys-libs/db/db-6.1.26.ebuild X-VCS-Directories: sys-libs/db/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: db548619f2d5a39f8bb523c60e99d20cf84ef513 X-VCS-Branch: master Date: Sat, 28 Nov 2015 20:26:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9c9b4256-f5e2-46d3-96e3-e0813ad89a85 X-Archives-Hash: 557a1b3e96d87478856c9c808dfc8722 commit: db548619f2d5a39f8bb523c60e99d20cf84ef513 Author: Mike Frysinger gentoo org> AuthorDate: Sat Nov 28 20:22:45 2015 +0000 Commit: Mike Frysinger gentoo 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+=(