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 9B84B1384B4 for ; Tue, 1 Dec 2015 16:30:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 225AAE0893; Tue, 1 Dec 2015 16:30:14 +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 BB729E0893 for ; Tue, 1 Dec 2015 16:30:13 +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 CFEBC34085B for ; Tue, 1 Dec 2015 16:30:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 99F00612 for ; Tue, 1 Dec 2015 16:30:09 +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: <1448987403.32c3b1e4bc0ef44b329c1e95366ed5f05059c125.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/busybox/files/busybox-1.24.1-trylink-ldflags.patch X-VCS-Directories: sys-apps/busybox/files/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 32c3b1e4bc0ef44b329c1e95366ed5f05059c125 X-VCS-Branch: master Date: Tue, 1 Dec 2015 16:30:09 +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: fc53a379-f4c0-43e4-8b34-fd362c3133f8 X-Archives-Hash: 9155a52f4cd477276dba97b8b2c315b3 commit: 32c3b1e4bc0ef44b329c1e95366ed5f05059c125 Author: Mike Frysinger gentoo org> AuthorDate: Tue Dec 1 16:29:55 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Tue Dec 1 16:30:03 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32c3b1e4 sys-apps/busybox: fix builds w/LDFLAGS=-fuse-ld=gold #499712 .../files/busybox-1.24.1-trylink-ldflags.patch | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/sys-apps/busybox/files/busybox-1.24.1-trylink-ldflags.patch b/sys-apps/busybox/files/busybox-1.24.1-trylink-ldflags.patch new file mode 100644 index 0000000..9d61ceb --- /dev/null +++ b/sys-apps/busybox/files/busybox-1.24.1-trylink-ldflags.patch @@ -0,0 +1,32 @@ +From 77e2bde6a50f0f6b9b3c9983c86e661a9872b5f6 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Tue, 1 Dec 2015 11:25:10 -0500 +Subject: [PATCH] trylink: include LDFLAGS when checking linkage + +The user might be including options in their LDFLAGS (like -fuse-ld=gold) +that change the behavior of the linker and thus change the results of the +flag tests. Make sure we include the user's LDFLAGS when running these +tests so we filter out flags that will fail when used later on. + +URL: https://bugs.gentoo.org/499712 +Signed-off-by: Mike Frysinger +--- + scripts/trylink | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/trylink b/scripts/trylink +index 6e1187e..3c431ed 100755 +--- a/scripts/trylink ++++ b/scripts/trylink +@@ -54,7 +54,7 @@ check_cc() { + # "eval" may be needed if CFLAGS can contain + # '... -D"BB_VER=KBUILD_STR(1.N.M)" ...' + # and we need shell to process quotes! +- $CC $CFLAGS $1 "$tempname".c -o "$tempname" >/dev/null 2>&1 ++ $CC $CFLAGS $LDFLAGS $1 "$tempname".c -o "$tempname" >/dev/null 2>&1 + r=$? + rm -f "$tempname" "$tempname".c "$tempname".o + return $r +-- +2.6.2 +