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 99D74138A2F for ; Tue, 19 Aug 2014 02:16:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF5D4E09E2; Tue, 19 Aug 2014 02:16:52 +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 4D7DDE09E0 for ; Tue, 19 Aug 2014 02:16:52 +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 ABA9A340028 for ; Tue, 19 Aug 2014 02:16:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 68AAC3B7E for ; Tue, 19 Aug 2014 01:07:18 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1408066938.212df0a5584a53a6c0f15a1079bae40bccb89a63.pesa@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: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 212df0a5584a53a6c0f15a1079bae40bccb89a63 X-VCS-Branch: master Date: Tue, 19 Aug 2014 01:07:18 +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: 024029ce-c111-483b-bbf9-fca3191e2bd0 X-Archives-Hash: 8fde4044a6e443564cff8f84f10f10b1 commit: 212df0a5584a53a6c0f15a1079bae40bccb89a63 Author: Davide Pesavento gentoo org> AuthorDate: Fri Aug 15 01:42:18 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Fri Aug 15 01:42:18 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=212df0a5 [qt5-build.eclass] Remove useless sed. The intent of these two expressions was to give precedence to the user's CXXFLAGS/LDFLAGS over those passed by the configure on the command line. However the user's flags are stored in .qmake.cache, which is read before processing command line variables anyway, thus there's no point in changing the order. Some other solution is needed. --- eclass/qt5-build.eclass | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 04800d3..9c2799c 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -189,10 +189,8 @@ qt5-build_src_prepare() { configure || die "sed failed (QMAKE_CONF_COMPILER)" # Respect toolchain and flags in config.tests - find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \ - sed -ri -e '/CXXFLAGS=/ s/"(\$CXXFLAGS) (\$PARAM)"/"\2 \1"/' \ - -e '/LFLAGS=/ s/"(\$LFLAGS) (\$PARAM)"/"\2 \1"/' \ - -e '/bin\/qmake/ s/-nocache //' \ + find config.tests/unix -name '*.test' -type f -print0 \ + | xargs -0 sed -i -e '/bin\/qmake/ s/-nocache //' \ || die "sed failed (config.tests)" fi 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 C44A213877A for ; Fri, 15 Aug 2014 01:53:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4630EE08E2; Fri, 15 Aug 2014 01:53:48 +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 9B9DBE08E5 for ; Fri, 15 Aug 2014 01:53:47 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 87E0134007C for ; Fri, 15 Aug 2014 01:53:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id A11EE1881D for ; Fri, 15 Aug 2014 01:53:43 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1408066938.212df0a5584a53a6c0f15a1079bae40bccb89a63.pesa@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: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 212df0a5584a53a6c0f15a1079bae40bccb89a63 X-VCS-Branch: master Date: Fri, 15 Aug 2014 01:53:43 +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: 7da5b8f6-35e9-4b33-a480-8d55c254efc4 X-Archives-Hash: d2cb8fd121a8dc1feca6276e739ff579 Message-ID: <20140815015343.G5RyLQVcKBgFj8GGrHuRB3S51-LW8sNKmn6GvlAFru8@z> commit: 212df0a5584a53a6c0f15a1079bae40bccb89a63 Author: Davide Pesavento gentoo org> AuthorDate: Fri Aug 15 01:42:18 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Fri Aug 15 01:42:18 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=212df0a5 [qt5-build.eclass] Remove useless sed. The intent of these two expressions was to give precedence to the user's CXXFLAGS/LDFLAGS over those passed by the configure on the command line. However the user's flags are stored in .qmake.cache, which is read before processing command line variables anyway, thus there's no point in changing the order. Some other solution is needed. --- eclass/qt5-build.eclass | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 04800d3..9c2799c 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -189,10 +189,8 @@ qt5-build_src_prepare() { configure || die "sed failed (QMAKE_CONF_COMPILER)" # Respect toolchain and flags in config.tests - find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \ - sed -ri -e '/CXXFLAGS=/ s/"(\$CXXFLAGS) (\$PARAM)"/"\2 \1"/' \ - -e '/LFLAGS=/ s/"(\$LFLAGS) (\$PARAM)"/"\2 \1"/' \ - -e '/bin\/qmake/ s/-nocache //' \ + find config.tests/unix -name '*.test' -type f -print0 \ + | xargs -0 sed -i -e '/bin\/qmake/ s/-nocache //' \ || die "sed failed (config.tests)" fi