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

Legend:
Removed from v.1.42  
changed lines
  Added in v.1.64

  ViewVC Help
Powered by ViewVC 1.1.20