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 987EF138C48 for ; Sun, 12 Apr 2015 15:54:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3DDD3E0C30; Sun, 12 Apr 2015 15:54:49 +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 E08C5E0C30 for ; Sun, 12 Apr 2015 15:54:48 +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 2F449340B00 for ; Sun, 12 Apr 2015 15:54:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 38DC815C55 for ; Sun, 12 Apr 2015 15:54:43 +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: <1428854020.a1d4bf6c0691a40ce206318b2349e3f375a22b3f.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: a1d4bf6c0691a40ce206318b2349e3f375a22b3f X-VCS-Branch: master Date: Sun, 12 Apr 2015 15:54: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 X-Archives-Salt: a83f8baf-a22f-4f97-832a-b5a29a47b4c8 X-Archives-Hash: f60c9b4b786aebfa7a364ff768339342 commit: a1d4bf6c0691a40ce206318b2349e3f375a22b3f Author: Davide Pesavento gentoo org> AuthorDate: Sun Apr 12 15:53:40 2015 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sun Apr 12 15:53:40 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a1d4bf6c [qt4-build-multilib.eclass] Merge two seds into one and simplify it. eclass/qt4-build-multilib.eclass | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass index 33c3ffe..c7e21cd 100644 --- a/eclass/qt4-build-multilib.eclass +++ b/eclass/qt4-build-multilib.eclass @@ -215,8 +215,12 @@ qt4-build-multilib_src_prepare() { 'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \ || die "sed config.tests failed" - # Bug 172219 - sed -e 's:/X11R6/:/:' -i mkspecs/$(qt4_get_mkspec)/qmake.conf || die + # Delete references to the obsolete /usr/X11R6 directory + # On prefix, this also prevents looking at non-prefix stuff + sed -i -re '/^QMAKE_(LIB|INC)DIR(_X11|_OPENGL|)\s+/ s/=.*/=/' \ + mkspecs/common/linux.conf \ + mkspecs/$(qt4_get_mkspec)/qmake.conf \ + || die "sed QMAKE_(LIB|INC)DIR failed" if [[ ${CHOST} == *-darwin* ]]; then # Set FLAGS and remove -arch, since our gcc-apple is multilib crippled (by design) @@ -254,7 +258,7 @@ qt4-build-multilib_src_prepare() { fi fi - # this is needed for all systems with a separate -liconv, except + # This is needed for all systems with a separate -liconv, except # Darwin, for which the sources already cater for -liconv if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then sed -i -e 's|mac:\(LIBS += -liconv\)|\1|g' \ @@ -267,10 +271,6 @@ qt4-build-multilib_src_prepare() { mkspecs/$(qt4_get_mkspec)/qmake.conf || die fi - # do not flirt with non-Prefix stuff, we're quite possessive - sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \ - mkspecs/$(qt4_get_mkspec)/qmake.conf || die - # apply patches [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" epatch_user