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

Legend:
Removed from v.1.41  
changed lines
  Added in v.1.67

  ViewVC Help
Powered by ViewVC 1.1.20