/[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.81 Revision 1.84
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.81 2010/08/14 18:00:38 hwoarang Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.84 2010/10/13 19:33:17 armin76 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>,
194 if [[ ${CHOST} == *86*-apple-darwin* ]] ; then 194 if [[ ${CHOST} == *86*-apple-darwin* ]] ; then
195 # qmake bus errors with -O2 but -O3 works 195 # qmake bus errors with -O2 but -O3 works
196 replace-flags -O2 -O3 196 replace-flags -O2 -O3
197 fi 197 fi
198 198
199 if [[ ${CHOST} == arm* ]] ; then
200 # Fails on arm with -Os, bug 331641
201 # This can be removed once qt-4.7 is stable or the bug on gcc is fixed
202 replace-flags -Os -O2
203 fi
204
205 # Bug 178652 199 # Bug 178652
206 if [[ $(gcc-major-version) == 3 ]] && use amd64; then 200 if [[ $(gcc-major-version) == 3 ]] && use amd64; then
207 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS" 201 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
208 append-flags -fno-gcse 202 append-flags -fno-gcse
209 fi 203 fi
228 -i configure || die "sed qmake compilers failed" 222 -i configure || die "sed qmake compilers failed"
229 # bug 321335 223 # bug 321335
230 if version_is_at_least 4.6; then 224 if version_is_at_least 4.6; then
231 find ./config.tests/unix -name "*.test" -type f -exec grep -lZ \$MAKE '{}' \; | \ 225 find ./config.tests/unix -name "*.test" -type f -exec grep -lZ \$MAKE '{}' \; | \
232 xargs -0 \ 226 xargs -0 \
233 sed -e "s:\(\$MAKE\):\1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getCXX)" "LINK=$(tc-getCXX)":g" \ 227 sed -e "s:\(\$MAKE\):\1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getCXX)" LINK="$(tc-getCXX)":g" \
234 -i || die "sed test compilers failed" 228 -i || die "sed test compilers failed"
235 fi 229 fi
236 230
237 # Bug 172219 231 # Bug 172219
238 sed -e "s:X11R6/::" \ 232 sed -e "s:X11R6/::" \
287 sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die 281 sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die
288 # don't flirt with non-Prefix stuff, we're quite possessive 282 # don't flirt with non-Prefix stuff, we're quite possessive
289 sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \ 283 sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \
290 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die 284 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
291 # strip predefined CFLAGS from qmake ( bug #312689 ) 285 # strip predefined CFLAGS from qmake ( bug #312689 )
292 sed -i '/^QMAKE_CFLAGS_\(RELEASE\|DEBUG\)/s:+=.*:+=:' mkspecs/common/g++.conf 286 sed -i '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf
293 287
294 base_src_prepare 288 base_src_prepare
295} 289}
296 290
297# @FUNCTION: qt4-build_src_configure 291# @FUNCTION: qt4-build_src_configure

Legend:
Removed from v.1.81  
changed lines
  Added in v.1.84

  ViewVC Help
Powered by ViewVC 1.1.20