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 8DD8B138CD0 for ; Sun, 31 May 2015 17:33:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E96C6E091B; Sun, 31 May 2015 17:33:37 +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 9FDF9E091B for ; Sun, 31 May 2015 17:33:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9E122340B9A for ; Sun, 31 May 2015 17:33:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 945969ED for ; Sun, 31 May 2015 17:33:33 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1433093589.f6b7f47fb07fda8aa6e0c3be5be7f60c2d541b0d.kensington@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: f6b7f47fb07fda8aa6e0c3be5be7f60c2d541b0d X-VCS-Branch: master Date: Sun, 31 May 2015 17:33:33 +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: 0d08b323-41c9-4160-a0aa-ebe006a6157c X-Archives-Hash: 23029ae252cd9f5b93946f4eb7569bbe commit: f6b7f47fb07fda8aa6e0c3be5be7f60c2d541b0d Author: Michael Palimaka gentoo org> AuthorDate: Sun May 31 17:33:09 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sun May 31 17:33:09 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f6b7f47f [eclass] Fix build failure with gold linker wrt bug #541262. eclass/qt5-build.eclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index f8c7674..a209cec 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -191,6 +191,10 @@ qt5-build_src_prepare() { sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \ configure || die "sed failed (QMAKE_CONF_COMPILER)" + # -fuse-ld is a gcc switch, not an ld switch (bug #541262) + sed -i -e '/linkerSupportsFlag $TEST_COMPILER -fuse-ld=gold/s/linker/compiler/' \ + configure || die "sed failed (-fuse-ld)" + # Respect toolchain and flags in config.tests find config.tests/unix -name '*.test' -type f \ -execdir sed -i -e '/bin\/qmake/ s/-nocache //' '{}' + \