/[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.9 Revision 1.58
1# Copyright 2007-2008 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.9 2008/03/06 14:44:13 zlin Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.58 2009/12/25 08:19:38 grobian Exp $
4 4
5# @ECLASS: qt4-build.eclass 5# @ECLASS: qt4-build.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Ben de Groot <yngwin@gentoo.org>,
8# Markos Chandras <hwoarang@gentoo.org>,
7# Caleb Tennis <caleb@gentoo.org> 9# Caleb Tennis <caleb@gentoo.org>
10# Alex Alexander <wired@gentoo.org>
8# @BLURB: Eclass for Qt4 split ebuilds. 11# @BLURB: Eclass for Qt4 split ebuilds.
9# @DESCRIPTION: 12# @DESCRIPTION:
10# This eclass contains various functions that are used when building Qt4 13# This eclass contains various functions that are used when building Qt4
11 14
12inherit eutils multilib toolchain-funcs flag-o-matic 15inherit base eutils multilib toolchain-funcs flag-o-matic versionator
13 16
14IUSE="${IUSE} debug" 17IUSE="debug pch aqua"
18RDEPEND="
19 !<x11-libs/qt-assistant-${PV}
20 !>x11-libs/qt-assistant-${PV}-r9999
21 !<x11-libs/qt-core-${PV}
22 !>x11-libs/qt-core-${PV}-r9999
23 !<x11-libs/qt-dbus-${PV}
24 !>x11-libs/qt-dbus-${PV}-r9999
25 !<x11-libs/qt-demo-${PV}
26 !>x11-libs/qt-demo-${PV}-r9999
27 !<x11-libs/qt-gui-${PV}
28 !>x11-libs/qt-gui-${PV}-r9999
29 !<x11-libs/qt-opengl-${PV}
30 !>x11-libs/qt-opengl-${PV}-r9999
31 !<x11-libs/qt-phonon-${PV}
32 !>x11-libs/qt-phonon-${PV}-r9999
33 !<x11-libs/qt-qt3support-${PV}
34 !>x11-libs/qt-qt3support-${PV}-r9999
35 !<x11-libs/qt-script-${PV}
36 !>x11-libs/qt-script-${PV}-r9999
37 !<x11-libs/qt-sql-${PV}
38 !>x11-libs/qt-sql-${PV}-r9999
39 !<x11-libs/qt-svg-${PV}
40 !>x11-libs/qt-svg-${PV}-r9999
41 !<x11-libs/qt-test-${PV}
42 !>x11-libs/qt-test-${PV}-r9999
43 !<x11-libs/qt-webkit-${PV}
44 !>x11-libs/qt-webkit-${PV}-r9999
45 !<x11-libs/qt-xmlpatterns-${PV}
46 !>x11-libs/qt-xmlpatterns-${PV}-r9999
47"
15 48
16case "${PV}" in 49MY_PV=${PV/_/-}
17 4.4.0_beta*)
18 SRCTYPE="${SRCTYPE:-opensource-src}"
19 MY_PV="${PV/_beta/-beta}"
20 ;;
21 *)
22 SRCTYPE="${SRCTYPE:-opensource-src}"
23 MY_PV="${PV}"
24 ;;
25esac
26S=${WORKDIR}/qt-x11-${SRCTYPE}-${MY_PV}
27 50
28SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${MY_PV}.tar.bz2" 51HOMEPAGE="http://qt.nokia.com/"
52if version_is_at_least 4.5.99999999 ${PV} ; then
53 SRC_URI="http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${MY_PV}.tar.gz"
54else
55 SRC_URI="aqua? ( http://get.qt.nokia.com/qt/source/qt-mac-opensource-src-${MY_PV}.tar.gz )
56 !aqua? ( http://get.qt.nokia.com/qt/source/qt-x11-opensource-src-${MY_PV}.tar.gz )"
57fi
29 58
59LICENSE="|| ( LGPL-2.1 GPL-3 )"
60
61# @FUNCTION: qt4-build_pkg_setup
62# @DESCRIPTION:
63# Sets up S, MY_P, PATH, and LD_LIBRARY_PATH
30qt4-build_pkg_setup() { 64qt4-build_pkg_setup() {
31 # Check USE requirements 65 [[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
32 qt4-build_check_use
33 66
34 # Set up installation directories 67 local MY_GE
35 QTBASEDIR=/usr/$(get_libdir)/qt4 68 if version_is_at_least 4.5.99999999 ${PV} ; then
36 QTPREFIXDIR=/usr 69 MY_P=qt-everywhere-opensource-src-${MY_PV}
37 QTBINDIR=/usr/bin 70 else
38 QTLIBDIR=/usr/$(get_libdir)/qt4 71 use aqua \
39 QTPCDIR=/usr/$(get_libdir)/pkgconfig 72 && MY_GE=mac \
40 QTDATADIR=/usr/share/qt4 73 || MY_GE=x11
41 QTDOCDIR=/usr/share/doc/qt-${PV} 74 MY_P=qt-${MY_GE}-opensource-src-${MY_PV}
42 QTHEADERDIR=/usr/include/qt4 75 fi
43 QTPLUGINDIR=${QTLIBDIR}/plugins 76 S=${WORKDIR}/${MY_P}
44 QTSYSCONFDIR=/etc/qt4
45 QTTRANSDIR=${QTDATADIR}/translations
46 QTEXAMPLESDIR=${QTDATADIR}/examples
47 QTDEMOSDIR=${QTDATADIR}/demos
48 77
49 PLATFORM=$(qt_mkspecs_dir)
50
51 PATH="${S}/bin:${PATH}" 78 PATH="${S}/bin${PATH:+:}${PATH}"
79 if [[ ${CHOST} != *-darwin* ]]; then
52 LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" 80 LD_LIBRARY_PATH="${S}/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
53} 81 else
82 DYLD_LIBRARY_PATH="${S}/lib${DYLD_LIBRARY_PATH:+:}${DYLD_LIBRARY_PATH}"
83 # on mac we *need* src/gui/kernel/qapplication_mac.cpp for platfrom
84 # detection since the x11-headers package b0rkens the header
85 # installation, we have to extract src/ and include/ completely on mac
86 # tools is needed for qt-demo and some others
87 QT4_EXTRACT_DIRECTORIES+=" src include"
54 88
89 if [[ ${PN} == qt-demo || ${PN} == qt-qt3support || ${PN} == qt-webkit ]]; then
90 QT4_EXTRACT_DIRECTORIES+=" tools"
91 fi
92 fi
93
94 # Make sure ebuilds use the required EAPI
95 if [[ ${EAPI} != [23] ]]; then
96 eerror "The qt4-build eclass requires EAPI=2 or EAPI=3, but this ebuild is using"
97 eerror "EAPI=${EAPI:-0}. The ebuild author or editor failed. This ebuild needs to be"
98 eerror "fixed. Using qt4-build eclass without EAPI=2 or EAPI=3 will fail."
99 die "qt4-build eclass requires EAPI=2 or EAPI=3"
100 fi
101
102 if ! version_is_at_least 4.1 $(gcc-version); then
103 ewarn "Using a GCC version lower than 4.1 is not supported!"
104 echo
105 ebeep 3
106 fi
107
108 if [[ ${P} == qt-core-4.6.0_rc1 ]]; then
109 ewarn
110 ewarn "Binary compatibility broke between 4.6.0_beta1 and 4.6.0_rc1."
111 ewarn "If you are upgrading from 4.6.0_beta1, you'll have to"
112 ewarn "re-emerge everything that depends on Qt."
113 ewarn "Use the following command:"
114 ewarn
115 ewarn " emerge -av1 \$(for i in \$(qlist -IC x11-libs/qt-);"
116 ewarn " do equery -q d \$i | grep -v 'x11-libs/qt-' |"
117 ewarn " sed \"s/^/=/\"; done)"
118 ewarn
119 ewarn "YOU'VE BEEN WARNED"
120 ewarn
121 ebeep 3
122 fi
123
124}
125
126# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
127# @DESCRIPTION:
128# Arguments for build_target_directories. Takes the directories, in which the
129# code should be compiled. This is a space-separated list
130
131# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
132# @DESCRIPTION:
133# Space separated list including the directories that will be extracted from Qt
134# tarball
135
136# @FUNCTION: qt4-build_src_unpack
137# @DESCRIPTION:
138# Unpacks the sources
55qt4-build_src_unpack() { 139qt4-build_src_unpack() {
56 # TODO: partial unpacks, cfr split KDE ebuilds. 140 setqtenv
57 unpack ${A} 141 local target targets=
142 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
143 src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \
144 ${QT4_EXTRACT_DIRECTORIES}; do
145 targets+=" ${MY_P}/${target}"
146 done
147
148 echo tar xzpf "${DISTDIR}"/${MY_P}.tar.gz ${targets}
149 tar xzpf "${DISTDIR}"/${MY_P}.tar.gz ${targets}
150}
151
152# @ECLASS-VARIABLE: PATCHES
153# @DESCRIPTION:
154# In case you have patches to apply, specify them in PATCHES variable. Make sure
155# to specify the full path. This variable is necessary for src_prepare phase.
156# example:
157# PATCHES="${FILESDIR}"/mypatch.patch
158# ${FILESDIR}"/mypatch2.patch"
159#
160
161# @FUNCTION: qt4-build_src_prepare
162# @DESCRIPTION:
163# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
164# source files in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified on /etc/make.conf.
165qt4-build_src_prepare() {
166 setqtenv
58 cd "${S}" 167 cd "${S}"
168
169 if use aqua; then
170 # provide a proper macx-g++-64
171 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir)
172
173 sed -e '/^CONFIG/s:app_bundle::' \
174 -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \
175 -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed failed"
176 fi
59 177
60 if [[ ${PN} != qt-core ]]; then 178 if [[ ${PN} != qt-core ]]; then
61 skip_qmake_build_patch 179 skip_qmake_build_patch
62 skip_project_generation_patch 180 skip_project_generation_patch
63 symlink_binaries_to_buildtree 181 symlink_binaries_to_buildtree
64 fi 182 fi
65 183
184 if [[ ${CHOST} == *86*-apple-darwin* ]] ; then
185 # qmake bus errors with -O2 but -O3 works
186 replace-flags -O2 -O3
187 fi
188
189 # Bug 282984 && Bug 295530
190 sed -e "s:\(^SYSTEM_VARIABLES\):CC=$(tc-getCC)\nCXX=$(tc-getCXX)\n\1:" \
191 -i configure || die "sed qmake compilers failed"
192 sed -e "s:\(\$MAKE\):\1 CC=$(tc-getCC) CXX=$(tc-getCXX) LD=$(tc-getCXX):" \
193 -i config.tests/unix/compile.test || die "sed test compilers failed"
194
195 # Bug 178652
196 if [[ $(gcc-major-version) == 3 ]] && use amd64; then
197 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
198 append-flags -fno-gcse
199 fi
200
201 # Unsupported old gcc versions - hardened needs this :(
202 if [[ $(gcc-major-version) -lt 4 ]] ; then
203 ewarn "Appending -fno-stack-protector to CXXFLAGS"
204 append-cxxflags -fno-stack-protector
205 # Bug 253127
206 sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \
207 -i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed"
208 fi
209
210 # Bug 261632
211 if use ppc64; then
212 ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS"
213 append-flags -mminimal-toc
214 fi
215
216 # Bug 172219
66 sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ 217 sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
67 -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ 218 -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
68 -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ 219 -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
69 -e "s:X11R6/::" \ 220 -e "s:X11R6/::" \
70 -i "${S}"/mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed ${S}/mkspecs/$(qt_mkspecs_dir)/qmake.conf failed" 221 -i "${S}"/mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed ${S}/mkspecs/$(qt_mkspecs_dir)/qmake.conf failed"
71 222
223 if [[ ${CHOST} != *-darwin* ]]; then
72 sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ 224 sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
73 -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ 225 -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
74 -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ 226 -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
75 -i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed" 227 -i mkspecs/common/g++.conf || die "sed mkspecs/common/g++.conf failed"
76} 228 else
229 # Set FLAGS *and* remove -arch, since our gcc-apple is multilib
230 # crippled (by design) :/
231 sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
232 -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
233 -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=-headerpad_max_install_names ${LDFLAGS}:" \
234 -e "s:-arch\s\w*::g" \
235 -i mkspecs/common/mac-g++.conf || die "sed mkspecs/common/mac-g++.conf failed"
77 236
78qt4-build_src_compile() { 237 # Fix configure's -arch settings that appear in qmake/Makefile and also
79 # Don't let the user go too overboard with flags. If you really want to, uncomment 238 # fix arch handling (automagically duplicates our -arch arg and breaks
80 # out the line below and give 'er a whirl. 239 # pch). Additionally disable Xarch support.
81 strip-flags 240 sed \
82 replace-flags -O3 -O2 241 -e "s:-arch i386::" \
242 -e "s:-arch ppc::" \
243 -e "s:-arch x86_64::" \
244 -e "s:-arch ppc64::" \
245 -e "s:-arch \$i::" \
246 -e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \
247 -e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \
248 -e "s:-Xarch_x86_64::g" \
249 -e "s:-Xarch_ppc64::g" \
250 -i configure mkspecs/common/mac-g++.conf || die "sed configure failed"
83 251
84 if [[ $(gcc-fullversion) == "3.4.6" && gcc-specs-ssp ]] ; then 252 # On Snow Leopard don't fall back to 10.5 deployment target.
85 ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS" 253 if [[ ${CHOST} == *-apple-darwin10 ]] ; then
86 append-flags -fno-stack-protector 254 sed -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \
255 -e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \
256 -i configure mkspecs/common/mac-g++.conf || die "sed configure failed"
87 fi 257 fi
258 fi
88 259
260 # this one is needed for all systems with a separate -liconv, apart from
261 # Darwin, for which the sources already cater for -liconv
262 if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] ; then
263 sed \
264 -e "s|mac:LIBS += -liconv|LIBS += -liconv|g" \
265 -i config.tests/unix/iconv/iconv.pro \
266 || die "sed on iconv.pro failed"
267 fi
268
269 # we need some patches for Solaris
270 sed -i \
271 -e '/^QMAKE_LFLAGS_THREAD/a\QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \
272 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
273 # use GCC over SunStudio
274 sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die
275 # don't flirt with non-Prefix stuff, we're quite possessive
276 sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \
277 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
278
279 base_src_prepare
280}
281
282# @FUNCTION: qt4-build_src_configure
283# @DESCRIPTION:
284# Default configure phase
285qt4-build_src_configure() {
286 setqtenv
89 myconf="$(standard_configure_options) ${myconf}" 287 myconf="$(standard_configure_options) ${myconf}"
288
289 # this one is needed for all systems with a separate -liconv, apart from
290 # Darwin, for which the sources already cater for -liconv
291 use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \
292 myconf+=" -liconv"
293
294 if has glib ${IUSE//+} && use glib; then
295 # use -I, -L and -l from configure
296 local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)"
297 # avoid the -pthread argument
298 myconf+=" ${glibflags//-pthread}"
299 unset glibflags
300 fi
301
302 if use aqua ; then
303 # On (snow) leopard use the new (frameworked) cocoa code.
304 if [[ $(uname -r | cut -d . -f 1) -ge 9 ]] ; then
305 myconf+=" -cocoa -framework"
306
307 # We are crazy and build cocoa + qt3support :-)
308 if use qt3support; then
309 sed -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \
310 -i configure
311 fi
312
313 # We need the source's headers, not the installed ones.
314 myconf+=" -I${S}/include"
315
316 # Add hint for the framework location.
317 myconf+=" -F${QTLIBDIR}"
318 fi
319 else
320 # freetype2 include dir is non-standard, thus include it on configure
321 # use -I from configure
322 myconf+=" $(pkg-config --cflags freetype2)"
323 fi
90 324
91 echo ./configure ${myconf} 325 echo ./configure ${myconf}
92 ./configure ${myconf} || die "./configure failed" 326 ./configure ${myconf} || die "./configure failed"
93 327 myconf=""
94 build_target_directories
95} 328}
96 329
330# @FUNCTION: qt4-build_src_compile
331# @DESCRIPTION: Actual compile phase
332qt4-build_src_compile() {
333 setqtenv
334
335 build_directories ${QT4_TARGET_DIRECTORIES}
336}
337
338# @FUNCTION: fix_includes
339# @DESCRIPTION:
340# For MacOSX we need to add some symlinks when frameworks are
341# being used, to avoid complications with some more or less stupid packages.
342fix_includes() {
343 if use aqua && [[ $(uname -r | cut -d . -f 1) -ge 9 ]] ; then
344 # Some packages tend to include <Qt/...>
345 dodir "${QTHEADERDIR#${EPREFIX}}"/Qt
346
347 # Fake normal headers when frameworks are installed... eases life later on
348 local dest f
349 for frw in "${D}${QTLIBDIR}"/*.framework; do
350 [[ -e "${frw}"/Headers ]] || continue
351 f=$(basename ${frw})
352 dest="${QTHEADERDIR#${EPREFIX}}"/${f%.framework}
353 dosym "${QTLIBDIR#${EPREFIX}}"/${f}/Headers "${dest}"
354
355 # Link normal headers as well.
356 for hdr in "${D}/${QTLIBDIR}/${f}"/Headers/*; do
357 h=$(basename ${hdr})
358 dosym "${QTLIBDIR#${EPREFIX}}"/${f}/Headers/${h} "${QTHEADERDIR#${EPREFIX}}"/Qt/${h}
359 done
360 done
361 fi
362}
363
364# @FUNCTION: qt4-build_src_install
365# @DESCRIPTION:
366# Perform the actual installation including some library fixes.
97qt4-build_src_install() { 367qt4-build_src_install() {
368 [[ ${EAPI} == 2 ]] && use !prefix && ED=${D}
369 setqtenv
98 install_directories "${QT4_TARGET_DIRECTORIES}" 370 install_directories ${QT4_TARGET_DIRECTORIES}
99 install_qconfigs 371 install_qconfigs
100 fix_library_files 372 fix_library_files
373 fix_includes
101} 374}
102 375
376# @FUNCTION: setqtenv
377setqtenv() {
378 # Set up installation directories
379 QTBASEDIR=${EPREFIX}/usr/$(get_libdir)/qt4
380 QTPREFIXDIR=${EPREFIX}/usr
381 QTBINDIR=${EPREFIX}/usr/bin
382 QTLIBDIR=${EPREFIX}/usr/$(get_libdir)/qt4
383 QMAKE_LIBDIR_QT=${QTLIBDIR}
384 QTPCDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig
385 QTDATADIR=${EPREFIX}/usr/share/qt4
386 QTDOCDIR=${EPREFIX}/usr/share/doc/qt-${PV}
387 QTHEADERDIR=${EPREFIX}/usr/include/qt4
388 QTPLUGINDIR=${QTLIBDIR}/plugins
389 QTSYSCONFDIR=${EPREFIX}/etc/qt4
390 QTTRANSDIR=${QTDATADIR}/translations
391 QTEXAMPLESDIR=${QTDATADIR}/examples
392 QTDEMOSDIR=${QTDATADIR}/demos
393 QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4
394 PLATFORM=$(qt_mkspecs_dir)
395
396 unset QMAKESPEC
397}
398
399# @FUNCTION: standard_configure_options
400# @DESCRIPTION:
401# Sets up some standard configure options, like libdir (if necessary), whether
402# debug info is wanted or not.
103standard_configure_options() { 403standard_configure_options() {
104 local myconf="" 404 local myconf=
105 405
106 [[ $(get_libdir) != "lib" ]] && myconf="${myconf} -L/usr/$(get_libdir)" 406 [[ $(get_libdir) != lib ]] && myconf+=" -L${EPREFIX}/usr/$(get_libdir)"
107 407
108 # Disable visibility explicitly if gcc version isn't 4 408 # Disable visibility explicitly if gcc version isn't 4
109 if [[ "$(gcc-major-version)" -lt "4" ]]; then 409 if [[ $(gcc-major-version) -lt 4 ]]; then
110 myconf="${myconf} -no-reduce-exports" 410 myconf+=" -no-reduce-exports"
111 fi 411 fi
412
413 # precompiled headers doesn't work on hardened, where the flag is masked.
414 myconf+=" $(qt_use pch)"
112 415
113 if use debug; then 416 if use debug; then
114 myconf="${myconf} -debug -no-separate-debug-info" 417 myconf+=" -debug"
115 else 418 else
419 myconf+=" -release"
420 fi
116 myconf="${myconf} -release -no-separate-debug-info" 421 myconf+=" -no-separate-debug-info"
422
423 use aqua && myconf+=" -no-framework"
424
425 # ARCH is set on Gentoo. Qt now falls back to generic on an unsupported
426 # $(tc-arch). Therefore we convert it to supported values.
427 case "$(tc-arch)" in
428 amd64|x64-*) myconf+=" -arch x86_64" ;;
429 ppc-macos) myconf+=" -arch ppc" ;;
430 ppc|ppc64|ppc-*) myconf+=" -arch powerpc" ;;
431 sparc|sparc-*) myconf+=" -arch sparc" ;;
432 x86-macos) myconf+=" -arch x86" ;;
433 x86|x86-*) myconf+=" -arch i386" ;;
434 alpha|arm|ia64|mips|s390|sparc) myconf+=" -arch $(tc-arch)" ;;
435 hppa|sh) myconf+=" -arch generic" ;;
436 *) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
437 esac
438
439 # 4.6: build qt-core with exceptions or qt-xmlpatterns won't build
440 local exceptions=
441 case "${PV}" in
442 4.6.*)
443 if [[ ${PN} != "qt-core" ]] && [[ ${PN} != "qt-xmlpatterns" ]]; then
444 case "${PV}:${CHOST}" in
445 4.6.0*:*-darwin*)
446 : # http://bugreports.qt.nokia.com/browse/QTBUG-5909
447 # workaround for compilation error on OSX (qt-gui)
448 ;;
449 *)
450 exceptions="-no-exceptions"
451 ;;
452 esac
117 fi 453 fi
454 ;;
455 *)
456 [[ ${PN} == "qt-xmlpatterns" ]] || exceptions="-no-exceptions"
457 ;;
458 esac
118 459
119 myconf="${myconf} -stl -verbose -largefile -confirm-license -no-rpath 460 # note about -reduce-relocations:
461 # That flag seems to introduce major breakage to applications,
462 # mostly to be seen as a core dump with the message "QPixmap: Must
463 # construct a QApplication before a QPaintDevice" on Solaris
464 # -- Daniel Vergien
465 [[ ${CHOST} != *-solaris* ]] && myconf+=" -reduce-relocations"
466
467 myconf+=" -platform $(qt_mkspecs_dir) -stl -verbose -largefile -confirm-license
120 -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} 468 -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
121 -datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} 469 -datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR}
122 -plugindir ${QTPLUGINDIR} -sysconfdir ${QTSYSCONFDIR} 470 -plugindir ${QTPLUGINDIR} -sysconfdir ${QTSYSCONFDIR}
123 -translationdir ${QTTRANSDIR} -examplesdir ${QTEXAMPLESDIR} 471 -translationdir ${QTTRANSDIR} -examplesdir ${QTEXAMPLESDIR}
124 -demosdir ${QTDEMOSDIR} -silent -fast -reduce-relocations 472 -demosdir ${QTDEMOSDIR} -silent -fast -opensource
473 ${exceptions}
125 -nomake examples -nomake demos" 474 -nomake examples -nomake demos"
126 475
127 echo "${myconf}" 476 echo "${myconf}"
128} 477}
129 478
130build_target_directories() { 479# @FUNCTION: build_directories
131 build_directories "${QT4_TARGET_DIRECTORIES}" 480# @USAGE: < directories >
132} 481# @DESCRIPTION:
133 482# Compiles the code in $QT4_TARGET_DIRECTORIES
134build_directories() { 483build_directories() {
135 local dirs="$@"
136 for x in ${dirs}; do 484 for x in "$@"; do
137 cd "${S}"/${x} 485 pushd "${S}"/${x} >/dev/null
486 sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:${EPREFIX}/usr/$(get_libdir)/qt4:g" $(find "${S}" -name '*.pr[io]') "${S}"/mkspecs/common/*.conf || die
138 "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed" 487 "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
139 emake || die "emake failed" 488 emake CC="@echo compiling \$< && $(tc-getCC)" \
489 CXX="@echo compiling \$< && $(tc-getCXX)" \
490 LINK="@echo linking \$@ && $(tc-getCXX)" || die "emake failed"
491 popd >/dev/null
140 done 492 done
141} 493}
142 494
495# @FUNCTION: install_directories
496# @USAGE: < directories >
497# @DESCRIPTION:
498# run emake install in the given directories, which are separated by spaces
143install_directories() { 499install_directories() {
144 local dirs="$@"
145 for x in ${dirs}; do 500 for x in "$@"; do
146 pushd "${S}"/${x} >/dev/null || die "Can't pushd ${S}/${x}" 501 pushd "${S}"/${x} >/dev/null || die "Can't pushd ${S}/${x}"
147 emake INSTALL_ROOT="${D}" install || die "emake install failed" 502 emake INSTALL_ROOT="${D}" install || die "emake install failed"
148 popd >/dev/null || die "Can't popd from ${S}/${x}" 503 popd >/dev/null || die "Can't popd from ${S}/${x}"
149 done 504 done
150} 505}
151 506
152# @ECLASS-VARIABLE: QCONFIG_ADD 507# @ECLASS-VARIABLE: QCONFIG_ADD
153# @DESCRIPTION: 508# @DESCRIPTION:
154# List options that need to be added to QT_CONFIG in qconfig.pri 509# List options that need to be added to QT_CONFIG in qconfig.pri
155QCONFIG_ADD="${QCONFIG_ADD:-}" 510: ${QCONFIG_ADD:=}
156 511
157# @ECLASS-VARIABLE: QCONFIG_REMOVE 512# @ECLASS-VARIABLE: QCONFIG_REMOVE
158# @DESCRIPTION: 513# @DESCRIPTION:
159# List options that need to be removed from QT_CONFIG in qconfig.pri 514# List options that need to be removed from QT_CONFIG in qconfig.pri
160QCONFIG_REMOVE="${QCONFIG_REMOVE:-}" 515: ${QCONFIG_REMOVE:=}
161 516
162# @ECLASS-VARIABLE: QCONFIG_DEFINE 517# @ECLASS-VARIABLE: QCONFIG_DEFINE
163# @DESCRIPTION: 518# @DESCRIPTION:
164# List variables that should be defined at the top of QtCore/qconfig.h 519# List variables that should be defined at the top of QtCore/qconfig.h
165QCONFIG_DEFINE="${QCONFIG_DEFINE:-}" 520: ${QCONFIG_DEFINE:=}
166 521
522# @FUNCTION: install_qconfigs
523# @DESCRIPTION: Install gentoo-specific mkspecs configurations
167install_qconfigs() { 524install_qconfigs() {
168 local x 525 local x
169 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then 526 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
170 for x in QCONFIG_ADD QCONFIG_REMOVE; do 527 for x in QCONFIG_ADD QCONFIG_REMOVE; do
171 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri 528 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
172 done 529 done
173 insinto ${QTDATADIR}/mkspecs/gentoo 530 insinto ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo
174 doins "${T}"/${PN}-qconfig.pri || die "installing ${PN}-qconfig.pri failed" 531 doins "${T}"/${PN}-qconfig.pri || die "installing ${PN}-qconfig.pri failed"
175 fi 532 fi
176 533
177 if [[ -n ${QCONFIG_DEFINE} ]]; then 534 if [[ -n ${QCONFIG_DEFINE} ]]; then
178 for x in ${QCONFIG_DEFINE}; do 535 for x in ${QCONFIG_DEFINE}; do
179 echo "#define ${x}" >> "${T}"/gentoo-${PN}-qconfig.h 536 echo "#define ${x}" >> "${T}"/gentoo-${PN}-qconfig.h
180 done 537 done
181 insinto ${QTHEADERDIR}/Gentoo 538 insinto ${QTHEADERDIR#${EPREFIX}}/Gentoo
182 doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed" 539 doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed"
183 fi 540 fi
184} 541}
185 542
186# Stubs for functions used by the Qt 4.4.0_technical_preview_1. 543# @FUNCTION: generate_qconfigs
187qconfig_add_option() { : ; } 544# @DESCRIPTION: Generates gentoo-specific configurations
188qconfig_remove_option() { : ; }
189
190generate_qconfigs() { 545generate_qconfigs() {
191 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then 546 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then
192 local x qconfig_add qconfig_remove qconfig_new 547 local x qconfig_add qconfig_remove qconfig_new
193 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do 548 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
194 [[ -f ${x} ]] || continue 549 [[ -f ${x} ]] || continue
195 qconfig_add="${qconfig_add} $(sed -n 's/^QCONFIG_ADD=//p' "${x}")" 550 qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")"
196 qconfig_remove="${qconfig_remove} $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")" 551 qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
197 done 552 done
198 553
199 # these error checks do not use die because dying in pkg_post{inst,rm} 554 # these error checks do not use die because dying in pkg_post{inst,rm}
200 # just makes things worse. 555 # just makes things worse.
201 if [[ -e "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri ]]; then 556 if [[ -e "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri ]]; then
208 563
209 # generate list of QT_CONFIG entries from the existing list 564 # generate list of QT_CONFIG entries from the existing list
210 # including qconfig_add and excluding qconfig_remove 565 # including qconfig_add and excluding qconfig_remove
211 for x in $(sed -n 's/^QT_CONFIG +=//p' \ 566 for x in $(sed -n 's/^QT_CONFIG +=//p' \
212 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do 567 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do
213 hasq ${x} ${qconfig_remove} || qconfig_new="${qconfig_new} ${x}" 568 hasq ${x} ${qconfig_remove} || qconfig_new+=" ${x}"
214 done 569 done
215 570
216 # replace the existing QT_CONFIG list with qconfig_new 571 # replace the existing QT_CONFIG list with qconfig_new
217 if ! sed -i -e "s/QT_CONFIG +=.*/QT_CONFIG += ${qconfig_new}/" \ 572 if ! sed -i -e "s/QT_CONFIG +=.*/QT_CONFIG += ${qconfig_new}/" \
218 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then 573 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then
241 "${ROOT}${QTHEADERDIR}" 2>/dev/null 596 "${ROOT}${QTHEADERDIR}" 2>/dev/null
242 fi 597 fi
243 fi 598 fi
244} 599}
245 600
601# @FUNCTION: qt4-build_pkg_postrm
602# @DESCRIPTION: Generate configurations when the package is completely removed
246qt4-build_pkg_postrm() { 603qt4-build_pkg_postrm() {
247 generate_qconfigs 604 generate_qconfigs
248} 605}
249 606
607# @FUNCTION: qt4-build_pkg_postinst
608# @DESCRIPTION: Generate configuration, plus throws a message about possible
609# breakages and proposed solutions.
250qt4-build_pkg_postinst() { 610qt4-build_pkg_postinst() {
251 generate_qconfigs 611 generate_qconfigs
252}
253 612
613 if [[ "${PN}" == "qt-core" ]]; then
614 echo
615 ewarn "After a rebuild or upgrade of Qt, it can happen that Qt plugins (such as Qt"
616 ewarn "and KDE styles and widgets) can no longer be loaded. In this situation you"
617 ewarn "should recompile the packages providing these plugins. Also, make sure you"
618 ewarn "compile the Qt packages, and the packages that depend on it, with the same"
619 ewarn "GCC version and the same USE flag settings (especially the debug flag)."
620 ewarn
621 ewarn "Packages that typically need to be recompiled are kdelibs from KDE4, any"
622 ewarn "additional KDE4/Qt4 styles, qscintilla and PyQt4. Before filing a bug report,"
623 ewarn "make sure all your Qt4 packages are up-to-date and built with the same"
624 ewarn "configuration."
625 ewarn
626 ewarn "For more information, see http://doc.trolltech.com/${PV%.*}/plugins-howto.html"
627 echo
628 fi
629}
630
631# @FUNCTION: skip_qmake_build_patch
632# @DESCRIPTION:
633# Don't need to build qmake, as it's already installed from qt-core
254skip_qmake_build_patch() { 634skip_qmake_build_patch() {
255 # Don't need to build qmake, as it's already installed from qt-core 635 # Don't need to build qmake, as it's already installed from qt-core
256 sed -i -e "s:if true:if false:g" "${S}"/configure || die "Sed failed" 636 sed -i -e "s:if true:if false:g" "${S}"/configure || die "Sed failed"
257} 637}
258 638
639# @FUNCTION: skip_project_generation_patch
640# @DESCRIPTION:
641# Exit the script early by throwing in an exit before all of the .pro files are scanned
259skip_project_generation_patch() { 642skip_project_generation_patch() {
260 # Exit the script early by throwing in an exit before all of the .pro files are scanned 643 # Exit the script early by throwing in an exit before all of the .pro files are scanned
261 sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \ 644 sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \
262 -i "${S}"/configure || die "Sed failed" 645 -i "${S}"/configure || die "Sed failed"
263} 646}
264 647
648# @FUNCTION: symlink_binaries_to_buildtree
649# @DESCRIPTION:
650# Symlink generated binaries to buildtree so they can be used during compilation
651# time
265symlink_binaries_to_buildtree() { 652symlink_binaries_to_buildtree() {
266 for bin in qmake moc uic rcc; do 653 for bin in qmake moc uic rcc; do
267 ln -s ${QTBINDIR}/${bin} "${S}"/bin/ || die "Symlinking ${bin} to ${S}/bin failed." 654 ln -s ${QTBINDIR}/${bin} "${S}"/bin/ || die "Symlinking ${bin} to ${S}/bin failed."
268 done 655 done
269} 656}
270 657
658# @FUNCTION: fix_library_files
659# @DESCRIPTION:
660# Fixes the pathes in *.la, *.prl, *.pc, as they are wrong due to sandbox and
661# moves the *.pc-files into the pkgconfig directory
271fix_library_files() { 662fix_library_files() {
272 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do 663 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do
273 if [[ -e ${libfile} ]]; then 664 if [[ -e ${libfile} ]]; then
274 sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "Sed on ${libfile} failed." 665 sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "Sed on ${libfile} failed."
275 fi 666 fi
278 # pkgconfig files refer to WORKDIR/bin as the moc and uic locations. Fix: 669 # pkgconfig files refer to WORKDIR/bin as the moc and uic locations. Fix:
279 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do 670 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do
280 if [[ -e ${libfile} ]]; then 671 if [[ -e ${libfile} ]]; then
281 sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "Sed failed" 672 sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "Sed failed"
282 673
283 # Move .pc files into the pkgconfig directory 674 # Move .pc files into the pkgconfig directory
284
285 dodir ${QTPCDIR} 675 dodir ${QTPCDIR#${EPREFIX}}
286 mv ${libfile} "${D}"/${QTPCDIR}/ \ 676 mv ${libfile} "${D}"/${QTPCDIR}/ \
287 || die "Moving ${libfile} to ${D}/${QTPCDIR}/ failed." 677 || die "Moving ${libfile} to ${D}/${QTPCDIR}/ failed."
288 fi 678 fi
289 done 679 done
290 680
291 # Don't install an empty directory 681 # Don't install an empty directory
292 rmdir "${D}"/${QTLIBDIR}/pkgconfig 682 rmdir "${D}"/${QTLIBDIR}/pkgconfig
293} 683}
294 684
685# @FUNCTION: qt_use
686# @USAGE: < flag > [ feature ] [ enableval ]
687# @DESCRIPTION:
688# This will echo "${enableval}-${feature}" if <flag> is enabled, or
689# "-no-${feature} if the flag is disabled. If [feature] is not specified <flag>
690# will be used for that. If [enableval] is not specified, it omits the
691# assignment-part
295qt_use() { 692qt_use() {
296 local flag="${1}" 693 local flag=$1
297 local feature="${1}" 694 local feature=$1
298 local enableval= 695 local enableval=
299 696
300 [[ -n ${2} ]] && feature=${2} 697 [[ -n $2 ]] && feature=$2
301 [[ -n ${3} ]] && enableval="-${3}" 698 [[ -n $3 ]] && enableval=-$3
302 699
303 if use ${flag}; then 700 if use ${flag}; then
304 echo "${enableval}-${feature}" 701 echo "${enableval}-${feature}"
305 else 702 else
306 echo "-no-${feature}" 703 echo "-no-${feature}"
307 fi 704 fi
308} 705}
309 706
310# @ECLASS-VARIABLE: QT4_BUILT_WITH_USE_CHECK 707# @FUNCTION: qt_mkspecs_dir
708# @RETURN: the specs-directory w/o path
311# @DESCRIPTION: 709# @DESCRIPTION:
312# The contents of $QT4_BUILT_WITH_USE_CHECK gets fed to built_with_use 710# Allows us to define which mkspecs dir we want to use.
313# (eutils.eclass), line per line.
314#
315# Example:
316# @CODE
317# pkg_setup() {
318# use qt3support && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK}
319# ~x11-libs/qt-gui-${PV} qt3support"
320# qt4-build_check_use
321# }
322# @CODE
323
324# Run built_with_use on each flag and print appropriate error messages if any
325# flags are missing
326_qt_built_with_use() {
327 local missing opt pkg flag flags
328
329 if [[ ${1} = "--missing" ]]; then
330 missing="${1} ${2}" && shift 2
331 fi
332 if [[ ${1:0:1} = "-" ]]; then
333 opt=${1} && shift
334 fi
335
336 pkg=${1} && shift
337
338 for flag in "${@}"; do
339 flags="${flags} ${flag}"
340 if ! built_with_use ${missing} ${opt} ${pkg} ${flag}; then
341 flags="${flags}*"
342 else
343 [[ ${opt} = "-o" ]] && return 0
344 fi
345 done
346 if [[ "${flags# }" = "${@}" ]]; then
347 return 0
348 fi
349 if [[ ${opt} = "-o" ]]; then
350 eerror "This package requires '${pkg}' to be built with any of the following USE flags: '$*'."
351 else
352 eerror "This package requires '${pkg}' to be built with the following USE flags: '${flags# }'."
353 fi
354 return 1
355}
356
357# @FUNCTION: qt4-build_check_use
358# @DESCRIPTION:
359# Check if the listed packages in $QT4_BUILT_WITH_USE_CHECK are built with the
360# USE flags listed.
361#
362# If any of the required USE flags are missing, an eerror will be printed for
363# each package with missing USE flags.
364qt4-build_check_use() {
365 local line missing
366 while read line; do
367 [[ -z ${line} ]] && continue
368 if ! _qt_built_with_use ${line}; then
369 missing=true
370 fi
371 done <<< "${QT4_BUILT_WITH_USE_CHECK}"
372 if [[ -n ${missing} ]]; then
373 echo
374 eerror "Flags marked with an * are missing."
375 die "Missing USE flags found"
376 fi
377}
378
379qt_mkspecs_dir() { 711qt_mkspecs_dir() {
380 # Allows us to define which mkspecs dir we want to use. 712 # Allows us to define which mkspecs dir we want to use.
381 local spec 713 local spec
382 714
383 case ${CHOST} in 715 case ${CHOST} in
384 *-freebsd*|*-dragonfly*) 716 *-freebsd*|*-dragonfly*)
385 spec="freebsd" ;; 717 spec=freebsd ;;
386 *-openbsd*) 718 *-openbsd*)
387 spec="openbsd" ;; 719 spec=openbsd ;;
388 *-netbsd*) 720 *-netbsd*)
389 spec="netbsd" ;; 721 spec=netbsd ;;
390 *-darwin*) 722 *-darwin*)
723 if use aqua; then
724 # mac with carbon/cocoa
725 spec=macx
726 else
727 # darwin/mac with x11
391 spec="darwin" ;; 728 spec=darwin
729 fi
730 ;;
731 *-solaris*)
732 spec=solaris ;;
392 *-linux-*|*-linux) 733 *-linux-*|*-linux)
393 spec="linux" ;; 734 spec=linux ;;
394 *) 735 *)
395 die "Unknown CHOST, no platform choosen." 736 die "Unknown CHOST, no platform choosen."
396 esac 737 esac
397 738
398 CXX=$(tc-getCXX) 739 CXX=$(tc-getCXX)
399 if [[ ${CXX/g++/} != ${CXX} ]]; then 740 if [[ ${CXX} == *g++* ]]; then
400 spec="${spec}-g++" 741 spec+=-g++
401 elif [[ ${CXX/icpc/} != ${CXX} ]]; then 742 elif [[ ${CXX} == *icpc* ]]; then
402 spec="${spec}-icc" 743 spec+=-icc
403 else 744 else
404 die "Unknown compiler ${CXX}." 745 die "Unknown compiler ${CXX}."
405 fi 746 fi
747 if [[ -n ${LIBDIR/lib} ]]; then
748 spec+=-${LIBDIR/lib}
749 fi
750
751 # Add -64 for 64bit profiles
752 if use x64-freebsd ||
753 use amd64-linux ||
754 use x64-macos ||
755 use x64-solaris ||
756 use sparc64-solaris
757 then
758 spec+=-64
759 fi
406 760
407 echo "${spec}" 761 echo "${spec}"
408} 762}
409 763
410EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postrm pkg_postinst 764EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install pkg_postrm pkg_postinst

Legend:
Removed from v.1.9  
changed lines
  Added in v.1.58

  ViewVC Help
Powered by ViewVC 1.1.20