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

Diff of /eclass/qt4-build.eclass

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

Revision 1.112 Revision 1.113
1# Copyright 1999-2011 Gentoo Foundation 1# Copyright 1999-2011 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.eclass,v 1.112 2011/12/30 14:39:26 pesa Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.113 2011/12/31 00:46:04 pesa Exp $
4 4
5# @ECLASS: qt4-build.eclass 5# @ECLASS: qt4-build.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Qt herd <qt@gentoo.org> 7# Qt herd <qt@gentoo.org>
8# @BLURB: Eclass for Qt4 split ebuilds. 8# @BLURB: Eclass for Qt4 split ebuilds.
238 CFLAGS='${CFLAGS}'\n\ 238 CFLAGS='${CFLAGS}'\n\
239 CXXFLAGS='${CXXFLAGS}'\n\ 239 CXXFLAGS='${CXXFLAGS}'\n\
240 LDFLAGS='${LDFLAGS}'\n" \ 240 LDFLAGS='${LDFLAGS}'\n" \
241 -i configure || die "sed SYSTEM_VARIABLES failed" 241 -i configure || die "sed SYSTEM_VARIABLES failed"
242 242
243 # Bug 321335 243 # Respect CC, CXX, LINK and *FLAGS in config.tests
244 find config.tests/unix -name '*.test' -type f -exec grep -lZ \$MAKE '{}' \; | xargs -0 \ 244 find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
245 sed -e "s:\(\$MAKE\):\1 CC='$(tc-getCC)' CXX='$(tc-getCXX)' LINK='$(tc-getCXX)':g" \ 245 sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \
246 -i || die "sed test compilers failed" 246 'QMAKE_CC=$(tc-getCC)' 'QMAKE_CXX=$(tc-getCXX)' 'QMAKE_LINK=$(tc-getCXX)' \
247 'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
248 || die "sed config.tests failed"
247 249
248 # Bug 172219 250 # Bug 172219
249 sed -e "s:X11R6/::" -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die 251 sed -e 's:/X11R6/:/:' -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
250 252
251 if [[ ${CHOST} == *-darwin* ]]; then 253 if [[ ${CHOST} == *-darwin* ]]; then
252 # Set FLAGS *and* remove -arch, since our gcc-apple is multilib 254 # Set FLAGS *and* remove -arch, since our gcc-apple is multilib
253 # crippled (by design) :/ 255 # crippled (by design) :/
254 sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ 256 sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
296 # use GCC over SunStudio 298 # use GCC over SunStudio
297 sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die 299 sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die
298 # don't flirt with non-Prefix stuff, we're quite possessive 300 # don't flirt with non-Prefix stuff, we're quite possessive
299 sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \ 301 sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \
300 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die 302 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
303
301 # strip predefined CFLAGS from qmake ( bug #312689 ) 304 # strip predefined CFLAGS from mkspecs (bug 312689)
302 sed -i '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf 305 sed -i -e '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf
303 306
304 base_src_prepare 307 base_src_prepare
305} 308}
306 309
307# @FUNCTION: qt4-build_src_configure 310# @FUNCTION: qt4-build_src_configure

Legend:
Removed from v.1.112  
changed lines
  Added in v.1.113

  ViewVC Help
Powered by ViewVC 1.1.20