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 95532138010 for ; Fri, 19 Oct 2012 15:32:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E201B21C067; Fri, 19 Oct 2012 15:31:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 50D6E21C067 for ; Fri, 19 Oct 2012 15:31:59 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B61C033DA61 for ; Fri, 19 Oct 2012 15:31:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6A7BAE5436 for ; Fri, 19 Oct 2012 15:31:57 +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: <1350660657.1ff0a54a8736cff809bfa476a1424bd5aa032b73.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: 1ff0a54a8736cff809bfa476a1424bd5aa032b73 X-VCS-Branch: master Date: Fri, 19 Oct 2012 15:31:57 +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: 8df364fa-dab0-4c67-b629-7d30fac7f8e7 X-Archives-Hash: ddec01b61412c31d3816518d566269d2 commit: 1ff0a54a8736cff809bfa476a1424bd5aa032b73 Author: Davide Pesavento gmail com> AuthorDate: Fri Oct 19 15:30:57 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Fri Oct 19 15:30:57 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=1ff0a54a [qt5-build.eclass] Fully respect user's *FLAGS during qmake bootstrap. --- eclass/qt5-build.eclass | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index f18a37d..91ccd06 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -163,23 +163,26 @@ qt5-build_src_prepare() { if [[ ${EGIT_PROJECT} == "qtbase" ]]; then if [[ ${PN} == "qt-core" ]]; then - # Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when building qmake - # FIXME: see bug 434780 - sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \ - ${MAKEOPTS} ${EXTRA_EMAKE} \ - 'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \ + # Respect CC, CXX, *FLAGS, MAKEOPTS and + # EXTRA_EMAKE when bootstrapping qmake + 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}'&:" \ - configure || die "sed qmake build failed" + -e '/"$CFG_RELEASE_QMAKE"/,/^\s\+fi$/ d' \ + configure || die "sed failed (respect env for qmake)" + sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \ + qmake/Makefile.unix || die "sed failed (CPPFLAGS)" else - # Skip qmake build + # Skip qmake bootstrap sed -i -e '/outpath\/qmake".*"$MAKE")/ d' \ - configure || die "sed qmake build failed" + configure || die "sed failed (skip qmake bootstrap)" rm -f qmake/Makefile* fi # Respect CXX in configure sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \ - configure || die "sed QMAKE_CONF_COMPILER failed" + configure || die "sed failed (QMAKE_CONF_COMPILER)" # Respect CC, CXX, LINK and *FLAGS in config.tests # FIXME: in compile.test, -m flags are passed to the linker via LIBS @@ -187,7 +190,7 @@ qt5-build_src_prepare() { sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \ 'QMAKE_CC=$(tc-getCC)' 'QMAKE_CXX=$(tc-getCXX)' 'QMAKE_LINK=$(tc-getCXX)' \ 'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \ - || die "sed config.tests failed" + || die "sed failed (config.tests)" fi if [[ ${PN} != "qt-core" ]]; then @@ -284,7 +287,7 @@ qt5-build_src_install() { sed -i -e '2a#include \n' \ "${D}${QTHEADERDIR}"/QtCore/qconfig.h \ "${D}${QTHEADERDIR}"/Qt/qconfig.h \ - || die "sed qconfig.h failed" + || die "sed failed (qconfig.h)" # install env.d file for custom LDPATH cat <<-EOF > "${T}"/55qt5