From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1Smmu0-0006ot-8U for garchives@archives.gentoo.org; Thu, 05 Jul 2012 14:19:28 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 436F8E068C; Thu, 5 Jul 2012 14:19:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 16CBBE068C for ; Thu, 5 Jul 2012 14:19:21 +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 7D2941B400D for ; Thu, 5 Jul 2012 14:19:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 44A72E5436 for ; Thu, 5 Jul 2012 14:19:19 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1341497880.34cfb9adfacd90d9f1a9904b91ba88015e9fb685.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: 34cfb9adfacd90d9f1a9904b91ba88015e9fb685 X-VCS-Branch: master Date: Thu, 5 Jul 2012 14:19:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 887fe9a5-02d1-417c-b029-fc2eb9c62d66 X-Archives-Hash: 81cb21adac2c478e13f5e477a6e3c3c4 commit: 34cfb9adfacd90d9f1a9904b91ba88015e9fb685 Author: Davide Pesavento gmail com> AuthorDate: Thu Jul 5 14:18:00 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Thu Jul 5 14:18:00 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/qt.git;a=3Dco= mmit;h=3D34cfb9ad [qt5-build.eclass] Fix build after recent upstream changes. --- eclass/qt5-build.eclass | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 24d99e3..477988a 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -166,21 +166,22 @@ qt5-build_src_prepare() { =20 mkdir -p "${QT5_BUILD_DIR}" || die =20 - if [[ ${PN} !=3D "qt-core" ]]; then + if [[ ${PN} =3D=3D "qt-core" ]]; then + # Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when building qmak= e + sed -i -e "/\"\$MAKE\".*QMAKE_BUILD_ERROR=3D/ s:): \ + ${MAKEOPTS} ${EXTRA_EMAKE} \ + 'CC=3D$(tc-getCC)' 'CXX=3D$(tc-getCXX)' \ + 'QMAKE_CFLAGS=3D${CFLAGS}' 'QMAKE_CXXFLAGS=3D${CXXFLAGS}' 'QMAKE_LFLA= GS=3D${LDFLAGS}'&:" \ + configure || die "sed configure failed" + else + # Skip qmake build + sed -i -e '/"$MAKE".*QMAKE_BUILD_ERROR=3D/ d' \ + configure || die "sed configure failed" + rm -f qmake/Makefile* + qt5_symlink_tools_to_buildtree fi =20 - # Avoid unnecessary qmake recompilations - sed -i -re "s|^if true;.*(\[ '\!').*(\"\\\$outpath/bin/qmake\".*)|if \1= -e \2 then|" \ - configure || die "sed configure failed" - - # Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when building qmake - sed -i -e "/\"\$MAKE\".*QMAKE_BUILD_ERROR/ s:): \ - ${MAKEOPTS} ${EXTRA_EMAKE} \ - 'CC=3D$(tc-getCC)' 'CXX=3D$(tc-getCXX)' \ - 'QMAKE_CFLAGS=3D${CFLAGS}' 'QMAKE_CXXFLAGS=3D${CXXFLAGS}' 'QMAKE_LFLAG= S=3D${LDFLAGS}'&:" \ - configure || die "sed configure failed" - # Respect CXX in configure sed -i -e "/^QMAKE_CONF_COMPILER=3D/ s:=3D.*:=3D\"$(tc-getCXX)\":" \ configure || die "sed QMAKE_CONF_COMPILER failed" @@ -398,8 +399,7 @@ qt5_symlink_tools_to_buildtree() { =20 local bin for bin in "${QTBINDIR}"/{qmake,moc,rcc,uic,qdoc}; do - ln -s "${bin}" "${QT5_BUILD_DIR}"/bin/ \ - || die "symlinking '${bin}' to '${QT5_BUILD_DIR}/bin/' failed" + ln -s "${bin}" "${QT5_BUILD_DIR}"/bin/ || die "failed to symlink ${bin= }" done } =20