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

Legend:
Removed from v.1.14  
changed lines
  Added in v.1.71

  ViewVC Help
Powered by ViewVC 1.1.20