/[gentoo-x86]/eclass/qt4-build-multilib.eclass
Gentoo

Diff of /eclass/qt4-build-multilib.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.25 Revision 1.26
1# Copyright 1999-2015 Gentoo Foundation 1# Copyright 1999-2015 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.25 2015/06/13 22:57:59 pesa Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.26 2015/06/13 23:05:46 pesa Exp $
4 4
5# @ECLASS: qt4-build-multilib.eclass 5# @ECLASS: qt4-build-multilib.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Qt herd <qt@gentoo.org> 7# Qt herd <qt@gentoo.org>
8# @AUTHOR: 8# @AUTHOR:
207 QMakeVar set QMAKE_LFLAGS_DEBUG\n' \ 207 QMakeVar set QMAKE_LFLAGS_DEBUG\n' \
208 configure || die "sed QMAKE_*FLAGS_{RELEASE,DEBUG} failed" 208 configure || die "sed QMAKE_*FLAGS_{RELEASE,DEBUG} failed"
209 209
210 # Drop -nocache from qmake invocation in all configure tests, to ensure that the 210 # Drop -nocache from qmake invocation in all configure tests, to ensure that the
211 # correct toolchain and build flags are picked up from config.tests/.qmake.cache 211 # correct toolchain and build flags are picked up from config.tests/.qmake.cache
212 find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \ 212 find config.tests/unix -name '*.test' -type f -execdir \
213 sed -i -e '/bin\/qmake/s/ -nocache//' || die "sed -nocache failed" 213 sed -i -e '/bin\/qmake/s/-nocache//' '{}' + || die "sed -nocache failed"
214 214
215 # compile.test needs additional patching so that it doesn't create another cache file 215 # compile.test needs additional patching so that it doesn't create another cache file
216 # inside the test subdir, which would incorrectly override config.tests/.qmake.cache 216 # inside the test subdir, which would incorrectly override config.tests/.qmake.cache
217 sed -i -e '/echo.*QT_BUILD_TREE.*\.qmake\.cache/d' \ 217 sed -i -e '/echo.*QT_BUILD_TREE.*\.qmake\.cache/d' \
218 -e '/bin\/qmake/s/ "$SRCDIR/ "QT_BUILD_TREE=$OUTDIR"&/' \ 218 -e '/bin\/qmake/s/ "$SRCDIR/ "QT_BUILD_TREE=$OUTDIR"&/' \

Legend:
Removed from v.1.25  
changed lines
  Added in v.1.26

  ViewVC Help
Powered by ViewVC 1.1.20