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

Legend:
Removed from v.1.15  
changed lines
  Added in v.1.65

  ViewVC Help
Powered by ViewVC 1.1.20