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 D4478138200 for ; Fri, 9 Nov 2012 09:24:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E91D421C004; Fri, 9 Nov 2012 09:24:33 +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 4809921C004 for ; Fri, 9 Nov 2012 09:24:33 +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 56CE933D876 for ; Fri, 9 Nov 2012 09:24:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C78A1E5436 for ; Fri, 9 Nov 2012 09:24:29 +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: <1352449327.7e71b2f4206711554e1efb181dd6ad3d30f0ec97.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: 7e71b2f4206711554e1efb181dd6ad3d30f0ec97 X-VCS-Branch: master Date: Fri, 9 Nov 2012 09:24:29 +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: 6b2c19b4-0b08-4839-8db2-b7eb99bc1a99 X-Archives-Hash: 1b09ba6d8d89f7e54a8909db19a29ea2 commit: 7e71b2f4206711554e1efb181dd6ad3d30f0ec97 Author: Davide Pesavento gmail com> AuthorDate: Fri Nov 9 08:22:07 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Fri Nov 9 08:22:07 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7e71b2f4 [qt4-build.eclass] Minor cleanup. --- eclass/qt4-build.eclass | 37 ++++++++++++++++++++----------------- 1 files changed, 20 insertions(+), 17 deletions(-) diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index ed50795..a679ca6 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -567,20 +567,20 @@ qt4-build_src_install() { setqtenv() { # Set up installation directories QTPREFIXDIR=${EPREFIX}/usr - QTBINDIR=${EPREFIX}/usr/bin - QTLIBDIR=${EPREFIX}/usr/$(get_libdir)/qt4 - QTPCDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig - QTDOCDIR=${EPREFIX}/usr/share/doc/qt-${PV} - QTHEADERDIR=${EPREFIX}/usr/include/qt4 + QTBINDIR=${QTPREFIXDIR}/bin + QTLIBDIR=${QTPREFIXDIR}/$(get_libdir)/qt4 + QTPCDIR=${QTPREFIXDIR}/$(get_libdir)/pkgconfig + QTDOCDIR=${QTPREFIXDIR}/share/doc/qt-${PV} + QTHEADERDIR=${QTPREFIXDIR}/include/qt4 QTPLUGINDIR=${QTLIBDIR}/plugins QTIMPORTDIR=${QTLIBDIR}/imports - QTDATADIR=${EPREFIX}/usr/share/qt4 + QTDATADIR=${QTPREFIXDIR}/share/qt4 QTTRANSDIR=${QTDATADIR}/translations QTSYSCONFDIR=${EPREFIX}/etc/qt4 QTEXAMPLESDIR=${QTDATADIR}/examples QTDEMOSDIR=${QTDATADIR}/demos QMAKE_LIBDIR_QT=${QTLIBDIR} - QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4 + QT_INSTALL_PREFIX=${QTLIBDIR} PLATFORM=$(qt_mkspecs_dir) unset QMAKESPEC @@ -594,23 +594,26 @@ setqtenv() { # @DESCRIPTION: # Generates Makefiles for the given list of directories. prepare_directories() { + # avoid running over the maximum argument number, bug #299810 + { + echo "${S}"/mkspecs/common/*.conf + find "${S}" -name '*.pr[io]' + } | xargs sed -i \ + -e "s:\$\$\[QT_INSTALL_LIBS\]:${QTLIBDIR}:g" \ + -e "s:\$\$\[QT_INSTALL_PLUGINS\]:${QTPLUGINDIR}:g" \ + || die + for x in "$@"; do pushd "${S}"/${x} >/dev/null || die einfo "Running qmake in: ${x}" - # avoid running over the maximum argument number, bug #299810 - { - echo "${S}"/mkspecs/common/*.conf - find "${S}" -name '*.pr[io]' - } | xargs sed -i \ - -e "s:\$\$\[QT_INSTALL_LIBS\]:${QTLIBDIR}:g" \ - -e "s:\$\$\[QT_INSTALL_PLUGINS\]:${QTPLUGINDIR}:g" \ - || die - "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed" + "${S}"/bin/qmake \ + "LIBS+=-L${QTLIBDIR}" \ + "CONFIG+=nostrip" \ + || die "qmake failed" popd >/dev/null || die done } - # @FUNCTION: build_directories # @USAGE: < directories > # @INTERNAL