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 0755E59CA4 for ; Sun, 13 Mar 2016 20:28:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7D1C721C01D; Sun, 13 Mar 2016 20:28:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 117A021C01D for ; Sun, 13 Mar 2016 20:28:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1841F340955 for ; Sun, 13 Mar 2016 20:28:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 348FC822 for ; Sun, 13 Mar 2016 20:28:52 +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: <1457899091.12f4fabfaca9bd4c0f62d8ba0b9731840eff588e.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: 12f4fabfaca9bd4c0f62d8ba0b9731840eff588e X-VCS-Branch: master Date: Sun, 13 Mar 2016 20:28:52 +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: 543f6836-ba01-45f7-ade7-11ed8192ff29 X-Archives-Hash: 439565f48fa7263bd4ad6256f2fbc39c commit: 12f4fabfaca9bd4c0f62d8ba0b9731840eff588e Author: Davide Pesavento gentoo org> AuthorDate: Sun Mar 13 19:58:11 2016 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sun Mar 13 19:58:11 2016 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=12f4fabf qt5-build.eclass: rewrite sed so that it works on 5.6 and 5.7 too eclass/qt5-build.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 4260c20..0a54bed 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -188,12 +188,12 @@ qt5-build_src_prepare() { sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \ ${MAKEOPTS} ${EXTRA_EMAKE} 'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \ 'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \ - -e '/"$CFG_RELEASE_QMAKE"/,/^\s\+fi$/ d' \ + -e 's/\(setBootstrapVariable\s\+\|EXTRA_C\(XX\)\?FLAGS=.*\)QMAKE_C\(XX\)\?FLAGS_\(DEBUG\|RELEASE\).*/:/' \ configure || die "sed failed (respect env for qmake build)" sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \ qmake/Makefile.unix || die "sed failed (CPPFLAGS for qmake build)" - # Respect CXX in {bsymbolic_functions,fvisibility,precomp}.test + # Respect CXX in bsymbolic_functions, fvisibility, precomp, and a few other tests sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \ configure || die "sed failed (QMAKE_CONF_COMPILER)"