/[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.83
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.83 2010/09/05 09:25:08 hwoarang 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>,
228 -i configure || die "sed qmake compilers failed" 228 -i configure || die "sed qmake compilers failed"
229 # bug 321335 229 # bug 321335
230 if version_is_at_least 4.6; then 230 if version_is_at_least 4.6; then
231 find ./config.tests/unix -name "*.test" -type f -exec grep -lZ \$MAKE '{}' \; | \ 231 find ./config.tests/unix -name "*.test" -type f -exec grep -lZ \$MAKE '{}' \; | \
232 xargs -0 \ 232 xargs -0 \
233 sed -e "s:\(\$MAKE\):\1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getCXX)" "LINK=$(tc-getCXX)":g" \ 233 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" 234 -i || die "sed test compilers failed"
235 fi 235 fi
236 236
237 # Bug 172219 237 # Bug 172219
238 sed -e "s:X11R6/::" \ 238 sed -e "s:X11R6/::" \
287 sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die 287 sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die
288 # don't flirt with non-Prefix stuff, we're quite possessive 288 # don't flirt with non-Prefix stuff, we're quite possessive
289 sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \ 289 sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \
290 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die 290 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
291 # strip predefined CFLAGS from qmake ( bug #312689 ) 291 # strip predefined CFLAGS from qmake ( bug #312689 )
292 sed -i '/^QMAKE_CFLAGS_\(RELEASE\|DEBUG\)/s:+=.*:+=:' mkspecs/common/g++.conf 292 sed -i '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf
293 293
294 base_src_prepare 294 base_src_prepare
295} 295}
296 296
297# @FUNCTION: qt4-build_src_configure 297# @FUNCTION: qt4-build_src_configure

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

  ViewVC Help
Powered by ViewVC 1.1.20