/[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.82 Revision 1.85
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.82 2010/08/14 18:09:10 hwoarang Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.85 2010/11/10 13:45:38 wired 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
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
333 fi 327 fi
334 else 328 else
335 # freetype2 include dir is non-standard, thus include it on configure 329 # freetype2 include dir is non-standard, thus include it on configure
336 # use -I from configure 330 # use -I from configure
337 myconf+=" $(pkg-config --cflags freetype2)" 331 myconf+=" $(pkg-config --cflags freetype2)"
332 fi
333
334 # Disable SSE4.x, since auto-detection is currently broken
335 # Upstream bug http://bugreports.qt.nokia.com/browse/QTBUG-13623
336 if version_is_at_least 4.7.1; then
337 myconf+=" -no-sse4.1 -no-sse4.2"
338 fi 338 fi
339 339
340 echo ./configure ${myconf} 340 echo ./configure ${myconf}
341 ./configure ${myconf} || die "./configure failed" 341 ./configure ${myconf} || die "./configure failed"
342 myconf="" 342 myconf=""

Legend:
Removed from v.1.82  
changed lines
  Added in v.1.85

  ViewVC Help
Powered by ViewVC 1.1.20