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.60) (envelope-from ) id 1SDxJe-0004oO-4z for garchives@archives.gentoo.org; Sat, 31 Mar 2012 12:21:58 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5ABE4E0E99; Sat, 31 Mar 2012 12:21:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1B921E0E99 for ; Sat, 31 Mar 2012 12:21:45 +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 8119A1B4014 for ; Sat, 31 Mar 2012 12:21:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3BE40E5402 for ; Sat, 31 Mar 2012 12:21:43 +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: <1333196452.efbb37fbd3df94148660e4417504f3b591633b8d.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt4-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: efbb37fbd3df94148660e4417504f3b591633b8d X-VCS-Branch: master Date: Sat, 31 Mar 2012 12:21: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 Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 9320ba1e-ac5c-4d26-9137-625c2c3be2ad X-Archives-Hash: bd9baa4b1653e811e1125cc7d80817df commit: efbb37fbd3df94148660e4417504f3b591633b8d Author: Davide Pesavento gmail com> AuthorDate: Sat Mar 31 12:20:52 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sat Mar 31 12:20:52 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/qt.git;a=3Dco= mmit;h=3Defbb37fb [qt4-build.eclass] Apply prefix fixes for qt 4.8, bug #407523. --- eclass/qt4-build.eclass | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index e3c60cf..78d699f 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -227,8 +227,9 @@ qt4-build_src_prepare() { fi =20 if [[ ${CHOST} =3D=3D *86*-apple-darwin* ]]; then - # qmake bus errors with -O2 but -O3 works - replace-flags -O2 -O3 + # qmake bus errors with -O2 or -O3 but -O1 works + # Bug 373061 + replace-flags -O[23] -O1 fi =20 # Bug 178652 @@ -289,17 +290,31 @@ qt4-build_src_prepare() { if [[ ${CHOST} =3D=3D *-darwin* ]]; then # Set FLAGS *and* remove -arch, since our gcc-apple is multilib # crippled (by design) :/ + local mac_gpp_conf=3D + if [[ -f mkspecs/common/mac-g++.conf ]]; then + # qt < 4.8 has mac-g++.conf + mac_gpp_conf=3D"mkspecs/common/mac-g++.conf" + elif [[ -f mkspecs/common/g++-macx.conf ]]; then + # qt >=3D 4.8 has g++-macx.conf + mac_gpp_conf=3D"mkspecs/common/g++-macx.conf" + else + die "no known conf file for mac found" + fi sed \ -e "s:QMAKE_CFLAGS_RELEASE.*=3D.*:QMAKE_CFLAGS_RELEASE=3D${CFLAGS}:" = \ -e "s:QMAKE_CXXFLAGS_RELEASE.*=3D.*:QMAKE_CXXFLAGS_RELEASE=3D${CXXFLA= GS}:" \ -e "s:QMAKE_LFLAGS_RELEASE.*=3D.*:QMAKE_LFLAGS_RELEASE=3D-headerpad_m= ax_install_names ${LDFLAGS}:" \ -e "s:-arch\s\w*::g" \ - -i mkspecs/common/mac-g++.conf \ - || die "sed mkspecs/common/mac-g++.conf failed" + -i ${mac_gpp_conf} \ + || die "sed ${mac_gpp_conf} failed" =20 # Fix configure's -arch settings that appear in qmake/Makefile and als= o # fix arch handling (automagically duplicates our -arch arg and breaks # pch). Additionally disable Xarch support. + local mac_gcc_confs=3D"${mac_gpp_conf}" + if [[ -f mkspecs/common/gcc-base-macx.conf ]]; then + mac_gcc_confs+=3D" mkspecs/common/gcc-base-macx.conf" + fi sed \ -e "s:-arch i386::" \ -e "s:-arch ppc::" \ @@ -310,14 +325,14 @@ qt4-build_src_prepare() { -e "s:CFG_MAC_XARCH=3Dyes:CFG_MAC_XARCH=3Dno:g" \ -e "s:-Xarch_x86_64::g" \ -e "s:-Xarch_ppc64::g" \ - -i configure mkspecs/common/mac-g++.conf \ + -i configure ${mac_gcc_confs} \ || die "sed -arch/-Xarch failed" =20 # On Snow Leopard don't fall back to 10.5 deployment target. if [[ ${CHOST} =3D=3D *-apple-darwin10 ]]; then sed -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set = QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \ -e "s:-mmacosx-version-min=3D10.[0-9]:-mmacosx-version-min=3D10.6:g"= \ - -i configure mkspecs/common/mac-g++.conf \ + -i configure ${mac_gpp_conf} \ || die "sed deployment target failed" fi fi