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 E203A1393E9 for ; Wed, 4 Jun 2014 00:14:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9AFAFE0B0C; Wed, 4 Jun 2014 00:14:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1B206E0B13 for ; Wed, 4 Jun 2014 00:14:00 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0104B33FBD2 for ; Wed, 4 Jun 2014 00:13:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 4ADAD182D5 for ; Wed, 4 Jun 2014 00:13: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: <1401840841.fd4931f7892c72794633e85bd0e212f43111bded.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt4-build-multilib.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: fd4931f7892c72794633e85bd0e212f43111bded X-VCS-Branch: master Date: Wed, 4 Jun 2014 00:13: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: 5cbd8ca5-a1b3-4690-8481-8f021819ec87 X-Archives-Hash: 96f95ee83ff51fa31bc32f73b80b6bcf commit: fd4931f7892c72794633e85bd0e212f43111bded Author: Davide Pesavento gentoo org> AuthorDate: Wed Jun 4 00:14:01 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Wed Jun 4 00:14:01 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fd4931f7 [qt4-build-multilib.eclass] Remove dead code. --- eclass/qt4-build-multilib.eclass | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass index 42e1097..0e26497 100644 --- a/eclass/qt4-build-multilib.eclass +++ b/eclass/qt4-build-multilib.eclass @@ -119,9 +119,11 @@ qt4-build-multilib_src_prepare() { fi if use_if_iuse aqua; then - sed -e '/^CONFIG/s:app_bundle::' \ + sed -i \ + -e '/^CONFIG/s:app_bundle::' \ -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \ - -i mkspecs/$(qt4_get_mkspec)/qmake.conf || die + mkspecs/$(qt4_get_mkspec)/qmake.conf \ + || die "sed failed (aqua)" fi # Bug 261632 @@ -167,34 +169,19 @@ qt4-build-multilib_src_prepare() { sed -e 's:/X11R6/:/:' -i mkspecs/$(qt4_get_mkspec)/qmake.conf || die if [[ ${CHOST} == *-darwin* ]]; then - # Set FLAGS *and* remove -arch, since our gcc-apple is multilib - # crippled (by design) :/ - local mac_gpp_conf= - if [[ -f mkspecs/common/mac-g++.conf ]]; then - # qt < 4.8 has mac-g++.conf - mac_gpp_conf="mkspecs/common/mac-g++.conf" - elif [[ -f mkspecs/common/g++-macx.conf ]]; then - # qt >= 4.8 has g++-macx.conf - mac_gpp_conf="mkspecs/common/g++-macx.conf" - else - die "no known conf file for mac found" - fi - sed \ + # Set FLAGS and remove -arch, since our gcc-apple is multilib crippled (by design) + sed -i \ -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=-headerpad_max_install_names ${LDFLAGS}:" \ -e "s:-arch\s\w*::g" \ - -i ${mac_gpp_conf} \ - || die "sed ${mac_gpp_conf} failed" + mkspecs/common/g++-macx.conf \ + || die "sed g++-macx.conf failed" # Fix configure's -arch settings that appear in qmake/Makefile and also # fix arch handling (automagically duplicates our -arch arg and breaks # pch). Additionally disable Xarch support. - local mac_gcc_confs="${mac_gpp_conf}" - if [[ -f mkspecs/common/gcc-base-macx.conf ]]; then - mac_gcc_confs+=" mkspecs/common/gcc-base-macx.conf" - fi - sed \ + sed -i \ -e "s:-arch i386::" \ -e "s:-arch ppc::" \ -e "s:-arch x86_64::" \ @@ -204,14 +191,15 @@ qt4-build-multilib_src_prepare() { -e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \ -e "s:-Xarch_x86_64::g" \ -e "s:-Xarch_ppc64::g" \ - -i configure ${mac_gcc_confs} \ + configure mkspecs/common/gcc-base-macx.conf mkspecs/common/g++-macx.conf \ || die "sed -arch/-Xarch failed" # On Snow Leopard don't fall back to 10.5 deployment target. if [[ ${CHOST} == *-apple-darwin10 ]]; then - sed -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \ + sed -i \ + -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \ -e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \ - -i configure ${mac_gpp_conf} \ + configure mkspecs/common/g++-macx.conf \ || die "sed deployment target failed" fi fi