pesa 15/04/22 20:23:47 Modified: ChangeLog qt4-build-multilib.eclass Log: Sync with qt overlay: cleanup prefix-related patching and fix bug #542780.
Revision Changes Path 1.1592 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1592&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1592&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1591&r2=1.1592 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1591 retrieving revision 1.1592 diff -u -r1.1591 -r1.1592 --- ChangeLog 21 Apr 2015 11:19:10 -0000 1.1591 +++ ChangeLog 22 Apr 2015 20:23:47 -0000 1.1592 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1591 2015/04/21 11:19:10 perfinion Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1592 2015/04/22 20:23:47 pesa Exp $ + + 22 Apr 2015; Davide Pesavento <[email protected]> qt4-build-multilib.eclass: + Sync with qt overlay: cleanup prefix-related patching and fix bug #542780. 21 Apr 2015; Jason Zaman <[email protected]> selinux-policy-2.eclass: update git urls and migrate git-2 -> git-r3 1.10 eclass/qt4-build-multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.10&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.10&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.9&r2=1.10 Index: qt4-build-multilib.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- qt4-build-multilib.eclass 1 Apr 2015 18:45:04 -0000 1.9 +++ qt4-build-multilib.eclass 22 Apr 2015 20:23:47 -0000 1.10 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.9 2015/04/01 18:45:04 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.10 2015/04/22 20:23:47 pesa Exp $ # @ECLASS: qt4-build-multilib.eclass # @MAINTAINER: @@ -198,7 +198,7 @@ configure || die "sed SYSTEM_VARIABLES failed" # Reset QMAKE_*FLAGS_{RELEASE,DEBUG} variables, - # or they will override user's flags (.qmake.cache) + # or they will override the user's flags (via .qmake.cache) sed -i -e '/^SYSTEM_VARIABLES=/ i \ QMakeVar set QMAKE_CFLAGS_RELEASE\ QMakeVar set QMAKE_CFLAGS_DEBUG\ @@ -215,8 +215,12 @@ '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,22 +258,10 @@ fi fi - # 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 -e 's|mac:\(LIBS += -liconv\)|\1|g' \ - -i config.tests/unix/iconv/iconv.pro \ - || die "sed iconv.pro failed" - fi - - # we need some patches for Solaris - sed -i -e '/^QMAKE_LFLAGS_THREAD/a\QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \ - mkspecs/$(qt4_get_mkspec)/qmake.conf || die - # use GCC over SunStudio - sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die - # 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 + if [[ ${CHOST} == *-solaris* ]]; then + sed -i -e '/^QMAKE_LFLAGS_THREAD/a QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \ + mkspecs/$(qt4_get_mkspec)/qmake.conf || die + fi # apply patches [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
