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 C33EC138CE7 for ; Sat, 13 Jun 2015 23:08:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5FFC9E07DA; Sat, 13 Jun 2015 23:08:31 +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 E4B33E07DA for ; Sat, 13 Jun 2015 23:08:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7E48F34095B for ; Sat, 13 Jun 2015 23:08:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4329B993 for ; Sat, 13 Jun 2015 23:08:26 +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: <1434236884.65763aa8eb76013181256a5dff2697664d6ed188.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: 65763aa8eb76013181256a5dff2697664d6ed188 X-VCS-Branch: master Date: Sat, 13 Jun 2015 23:08:26 +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: b7a383fd-d5de-4cf6-9e85-a1dd4400d458 X-Archives-Hash: 6c2399e9739e5cb296a119dc04857552 commit: 65763aa8eb76013181256a5dff2697664d6ed188 Author: Davide Pesavento gentoo org> AuthorDate: Sat Jun 13 23:08:04 2015 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sat Jun 13 23:08:04 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=65763aa8 [qt4-build-multilib.eclass] Sync. eclass/qt4-build-multilib.eclass | 54 ++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass index 078b61c..747f2c5 100644 --- a/eclass/qt4-build-multilib.eclass +++ b/eclass/qt4-build-multilib.eclass @@ -171,9 +171,20 @@ qt4-build-multilib_src_prepare() { fi fi + if [[ ${PN} == qtdeclarative ]]; then + # Bug 551560 + # gcc-4.8 ICE with -Os, fixed in 4.9 + if use x86 && [[ $(gcc-version) == 4.8 ]]; then + replace-flags -Os -O2 + fi + fi + if [[ ${PN} == qtwebkit ]]; then # Bug 550780 - filter-flags -fgraphite-identity -floop-strip-mine + # various ICEs with graphite-related flags, gcc-5 works + if [[ $(gcc-major-version) -lt 5 ]]; then + filter-flags -fgraphite-identity -floop-strip-mine + fi fi # Bug 261632 @@ -198,8 +209,8 @@ qt4-build-multilib_src_prepare() { # Drop -nocache from qmake invocation in all configure tests, to ensure that the # correct toolchain and build flags are picked up from config.tests/.qmake.cache - find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \ - sed -i -e '/bin\/qmake/s/ -nocache//' || die "sed -nocache failed" + find config.tests/unix -name '*.test' -type f -execdir \ + sed -i -e '/bin\/qmake/s/-nocache//' '{}' + || die "sed -nocache failed" # compile.test needs additional patching so that it doesn't create another cache file # inside the test subdir, which would incorrectly override config.tests/.qmake.cache @@ -285,21 +296,21 @@ qt4_multilib_src_configure() { CC=$(tc-getCC) \ CXX=$(tc-getCXX) \ LD=$(tc-getCXX) \ + MAKEFLAGS=${MAKEOPTS} \ OBJCOPY=$(tc-getOBJCOPY) \ + OBJDUMP=$(tc-getOBJDUMP) \ STRIP=$(tc-getSTRIP) # convert tc-arch to the values supported by Qt - local arch= - case $(tc-arch) in - amd64|x64-*) arch=x86_64 ;; - ppc*-macos) arch=ppc ;; - ppc*) arch=powerpc ;; - sparc*) arch=sparc ;; - x86-macos) arch=x86 ;; - x86*) arch=i386 ;; - alpha|arm|ia64|mips|s390) arch=$(tc-arch) ;; - arm64|hppa|sh) arch=generic ;; - *) die "qt4-build-multilib.eclass: unsupported tc-arch '$(tc-arch)'" ;; + local arch=$(tc-arch) + case ${arch} in + amd64|x64-*) arch=x86_64 ;; + arm64|hppa) arch=generic ;; + ppc*-macos) arch=ppc ;; + ppc*) arch=powerpc ;; + sparc*) arch=sparc ;; + x86-macos) arch=x86 ;; + x86*) arch=i386 ;; esac # configure arguments @@ -462,15 +473,10 @@ qt4_multilib_src_install() { fi fi - # move pkgconfig files to the correct location - eshopts_push -s nullglob - local pcfile - for pcfile in "${D}/${QT4_LIBDIR}"/pkgconfig/*.pc; do - dodir /usr/$(get_libdir)/pkgconfig - mv "${pcfile}" "${ED}"/usr/$(get_libdir)/pkgconfig || die - done - eshopts_pop - rmdir "${D}/${QT4_LIBDIR}"/pkgconfig || die + # move pkgconfig directory to the correct location + if [[ -d ${D}${QT4_LIBDIR}/pkgconfig ]]; then + mv "${D}${QT4_LIBDIR}"/pkgconfig "${ED}usr/$(get_libdir)" || die + fi qt4_install_module_qconfigs qt4_symlink_framework_headers @@ -754,7 +760,7 @@ qt4_symlink_framework_headers() { dosym "${rdir}"/${f}/Headers "${dest}" # Link normal headers as well. - for hdr in "${D}/${QT4_LIBDIR}/${f}"/Headers/*; do + for hdr in "${D}${QT4_LIBDIR}/${f}"/Headers/*; do h=$(basename ${hdr}) dosym "../${rdir}"/${f}/Headers/${h} \ "${QT4_HEADERDIR#${EPREFIX}}"/Qt/${h}