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 1NV8ze-0007G6-TP for garchives@archives.gentoo.org; Wed, 13 Jan 2010 19:35:03 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59EC4E0831; Wed, 13 Jan 2010 19:35:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 38FB9E0831 for ; Wed, 13 Jan 2010 19:35:02 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id E6AC51B418D for ; Wed, 13 Jan 2010 19:35:01 +0000 (UTC) Received: from abcd by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1NV8zd-0008Ec-D2 for gentoo-commits@lists.gentoo.org; Wed, 13 Jan 2010 19:35:01 +0000 From: "Jonathan Callen (abcd)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, abcd@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: qt4-build.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: qt4-build.eclass X-VCS-Directories: eclass X-VCS-Committer: abcd X-VCS-Committer-Name: Jonathan Callen Content-Type: text/plain; charset=utf8 Message-Id: Sender: Jonathan Callen Date: Wed, 13 Jan 2010 19:35:01 +0000 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: a1d6b332-7798-4342-9edb-671576ca6476 X-Archives-Hash: 109f0a3476412466242a6c00c69fbe39 abcd 10/01/13 19:35:01 Modified: qt4-build.eclass Log: Add last couple of changes from prefix overlay Revision Changes Path 1.60 eclass/qt4-build.eclass file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.e= class?rev=3D1.60&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.e= class?rev=3D1.60&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.e= class?r1=3D1.59&r2=3D1.60 Index: qt4-build.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- qt4-build.eclass 25 Dec 2009 15:27:22 -0000 1.59 +++ qt4-build.eclass 13 Jan 2010 19:35:01 -0000 1.60 @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.59 2009/1= 2/25 15:27:22 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.60 2010/0= 1/13 19:35:01 abcd Exp $ =20 # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -315,7 +315,7 @@ # For MacOSX we need to add some symlinks when frameworks are # being used, to avoid complications with some more or less stupid packa= ges. fix_includes() { - if use aqua && [[ $(uname -r | cut -d . -f 1) -ge 9 ]] ; then + if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then # Some packages tend to include dodir "${QTHEADERDIR#${EPREFIX}}"/Qt =20 @@ -458,7 +458,11 @@ build_directories() { for x in "$@"; do pushd "${S}"/${x} >/dev/null - sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:${EPREFIX}/usr/$(get_libdir)/qt4:= g" $(find "${S}" -name '*.pr[io]') "${S}"/mkspecs/common/*.conf || die + # 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\]:${EPREFIX}/usr/$(get_li= bdir)/qt4:g" || die "${S}"/bin/qmake "LIBS+=3D-L${QTLIBDIR}" "CONFIG+=3Dnostrip" || die "q= make failed" emake CC=3D"@echo compiling \$< && $(tc-getCC)" \ CXX=3D"@echo compiling \$< && $(tc-getCXX)" \