/[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.87 Revision 1.89
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.87 2010/11/13 20:50:57 wired Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.89 2011/03/03 21:39:29 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>,
218 ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS" 218 ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS"
219 append-flags -mminimal-toc 219 append-flags -mminimal-toc
220 fi 220 fi
221 221
222 # Bug 282984 && Bug 295530 222 # Bug 282984 && Bug 295530
223 sed -e "s:\(^SYSTEM_VARIABLES\):CC="$(tc-getCC)"\nCXX="$(tc-getCXX)"\nCFLAGS=\"${CFLAGS}\"\nCXXFLAGS=\"${CXXFLAGS}\"\nLDFLAGS=\"${LDFLAGS}\"\n\1:" \ 223 sed -e "s:\(^SYSTEM_VARIABLES\):CC=\"$(tc-getCC)\"\nCXX=\"$(tc-getCXX)\"\nCFLAGS=\"${CFLAGS}\"\nCXXFLAGS=\"${CXXFLAGS}\"\nLDFLAGS=\"${LDFLAGS}\"\n\1:" \
224 -i configure || die "sed qmake compilers failed" 224 -i configure || die "sed qmake compilers failed"
225 # bug 321335 225 # bug 321335
226 if version_is_at_least 4.6; then 226 if version_is_at_least 4.6; then
227 find ./config.tests/unix -name "*.test" -type f -exec grep -lZ \$MAKE '{}' \; | \ 227 find ./config.tests/unix -name "*.test" -type f -exec grep -lZ \$MAKE '{}' \; | \
228 xargs -0 \ 228 xargs -0 \
229 sed -e "s:\(\$MAKE\):\1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getCXX)" LINK="$(tc-getCXX)":g" \ 229 sed -e "s:\(\$MAKE\):\1 CC=\"$(tc-getCC)\" CXX=\"$(tc-getCXX)\" LD=\"$(tc-getCXX)\" LINK=\"$(tc-getCXX)\":g" \
230 -i || die "sed test compilers failed" 230 -i || die "sed test compilers failed"
231 fi 231 fi
232 232
233 # Bug 172219 233 # Bug 172219
234 sed -e "s:X11R6/::" \ 234 sed -e "s:X11R6/::" \
333 myconf+=" $(pkg-config --cflags freetype2)" 333 myconf+=" $(pkg-config --cflags freetype2)"
334 fi 334 fi
335 335
336 # Disable SSE4.x, since auto-detection is currently broken 336 # Disable SSE4.x, since auto-detection is currently broken
337 # Upstream bug http://bugreports.qt.nokia.com/browse/QTBUG-13623 337 # Upstream bug http://bugreports.qt.nokia.com/browse/QTBUG-13623
338 if version_is_at_least 4.7.1; then 338 [[ ${PV} == "4.7.1" ]] && myconf+=" -no-sse4.1 -no-sse4.2"
339 myconf+=" -no-sse4.1 -no-sse4.2"
340 fi
341 339
342 echo ./configure ${myconf} 340 echo ./configure ${myconf}
343 ./configure ${myconf} || die "./configure failed" 341 ./configure ${myconf} || die "./configure failed"
344 myconf="" 342 myconf=""
345} 343}

Legend:
Removed from v.1.87  
changed lines
  Added in v.1.89

  ViewVC Help
Powered by ViewVC 1.1.20