/[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.68 Revision 1.70
1# Copyright 1999-2009 Gentoo Foundation 1# Copyright 1999-2009 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.68 2010/05/22 19:23:51 wired Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.70 2010/05/24 22:03:30 spatz Exp $
4 4
5# @ECLASS: qt4-build.eclass 5# @ECLASS: qt4-build.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Ben de Groot <yngwin@gentoo.org>, 7# Ben de Groot <yngwin@gentoo.org>,
8# Markos Chandras <hwoarang@gentoo.org>, 8# Markos Chandras <hwoarang@gentoo.org>,
160# source files in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified on /etc/make.conf. 160# source files in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified on /etc/make.conf.
161qt4-build_src_prepare() { 161qt4-build_src_prepare() {
162 setqtenv 162 setqtenv
163 cd "${S}" 163 cd "${S}"
164 164
165 # fix qt 4.7 regression that skips -fvisibility=hidden
166 if [[ "${PV}" == "4.7.0_beta1" ]]; then
167 sed -e "s/^gcc|g++)/*gcc|*g++)/" \
168 -i config.tests/unix/fvisibility.test ||
169 die "visibility fixing sed failed"
170 fi
171
165 if use aqua; then 172 if use aqua; then
166 # provide a proper macx-g++-64 173 # provide a proper macx-g++-64
167 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir) 174 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir)
168 175
169 sed -e '/^CONFIG/s:app_bundle::' \ 176 sed -e '/^CONFIG/s:app_bundle::' \
204 fi 211 fi
205 212
206 # Bug 282984 && Bug 295530 213 # Bug 282984 && Bug 295530
207 sed -e "s:\(^SYSTEM_VARIABLES\):CC=$(tc-getCC)\nCXX=$(tc-getCXX)\nCFLAGS=\"${CFLAGS}\"\nCXXFLAGS=\"${CXXFLAGS}\"\nLDFLAGS=\"${LDFLAGS}\"\n\1:" \ 214 sed -e "s:\(^SYSTEM_VARIABLES\):CC=$(tc-getCC)\nCXX=$(tc-getCXX)\nCFLAGS=\"${CFLAGS}\"\nCXXFLAGS=\"${CXXFLAGS}\"\nLDFLAGS=\"${LDFLAGS}\"\n\1:" \
208 -i configure || die "sed qmake compilers failed" 215 -i configure || die "sed qmake compilers failed"
216 # bug 321335
217 find ./config.tests/unix -name "*.test" -type f -exec grep -lZ \$MAKE '{}' \; | \
218 xargs -0 \
209 sed -e "s:\(\$MAKE\):\1 CC=$(tc-getCC) CXX=$(tc-getCXX) LD=$(tc-getCXX) LINK=$(tc-getCXX):" \ 219 sed -e "s:\(\$MAKE\):\1 CC=$(tc-getCC) CXX=$(tc-getCXX) LD=$(tc-getCXX) LINK=$(tc-getCXX):g" \
210 -i config.tests/unix/compile.test || die "sed test compilers failed" 220 -i || die "sed test compilers failed"
211 221
212 # Bug 172219 222 # Bug 172219
213 sed -e "s:X11R6/::" \ 223 sed -e "s:X11R6/::" \
214 -i "${S}"/mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed ${S}/mkspecs/$(qt_mkspecs_dir)/qmake.conf failed" 224 -i "${S}"/mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed ${S}/mkspecs/$(qt_mkspecs_dir)/qmake.conf failed"
215 225

Legend:
Removed from v.1.68  
changed lines
  Added in v.1.70

  ViewVC Help
Powered by ViewVC 1.1.20