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 043E41381F3 for ; Mon, 12 Nov 2012 04:07:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 27C2621C0AD; Mon, 12 Nov 2012 04:07:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 821A921C0A1 for ; Mon, 12 Nov 2012 04:07:44 +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 928A433D9BB for ; Mon, 12 Nov 2012 04:07:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 591EBE5444 for ; Mon, 12 Nov 2012 04:07:41 +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: <1352688720.53d958b40d6152d4de0ecb8182a5e7344a2faf2f.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: 53d958b40d6152d4de0ecb8182a5e7344a2faf2f X-VCS-Branch: master Date: Mon, 12 Nov 2012 04:07:41 +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: ae7b4810-ad1d-4f14-8106-109971a57e5b X-Archives-Hash: 97585ce7e0f95169633e6233ebb79a42 commit: 53d958b40d6152d4de0ecb8182a5e7344a2faf2f Author: Davide Pesavento gmail com> AuthorDate: Mon Nov 12 02:52:00 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Mon Nov 12 02:52:00 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=53d958b4 [qt5-build.eclass] Adapt to recent upstream changes. --- eclass/qt5-build.eclass | 32 ++++++++++++++------------------ 1 files changed, 14 insertions(+), 18 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 738e70d..f12a2e6 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -162,22 +162,18 @@ qt5-build_src_prepare() { mkdir -p "${QT5_BUILD_DIR}" || die if [[ ${EGIT_PROJECT} == "qtbase" ]]; then - if [[ ${PN} == "qt-core" ]]; then - # 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}'&:" \ - -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 bootstrap - sed -i -e '/outpath\/qmake".*"$MAKE")/ d' \ - configure || die "sed failed (skip qmake bootstrap)" - rm -f qmake/Makefile* - fi + # Avoid unnecessary qmake recompilations + sed -i -re "s|^if true;.*(\[ '\!').*(\"\\\$outpath/bin/qmake\".*)|if \1 -e \2 then|" \ + configure || die "sed failed (skip qmake bootstrap)" + + # 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}'&:" \ + -e '/"$CFG_RELEASE_QMAKE"/,/^\s\+fi$/ d' \ + 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)" # Reset QMAKE_*FLAGS_{RELEASE,DEBUG} variables, # or they will override user's flags (bug 427782) @@ -232,7 +228,6 @@ qt5-build_src_configure() { einfo "Running qmake" ./bin/qmake -recursive \ "${S}"/${EGIT_PROJECT}.pro \ - $(version_is_at_least 5.0.0_beta2 || echo "CONFIG+=nostrip") \ QMAKE_LIBDIR+="${QT5_BUILD_DIR}/lib" \ QMAKE_LIBDIR+="${QTLIBDIR}" \ || die "qmake failed" @@ -416,6 +411,7 @@ qt5_base_configure() { # prefer system libraries -system-zlib -system-pcre + -system-xcb # exclude examples and tests from default build -nomake examples @@ -428,7 +424,7 @@ qt5_base_configure() { -verbose $(${QT5_VERBOSE_BUILD} || echo -silent) # don't strip - $(version_is_at_least 5.0.0_beta2 && echo -no-strip) + -no-strip # precompiled headers don't work on hardened, where the flag is masked $(qt_use pch)