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

Legend:
Removed from v.1.54  
changed lines
  Added in v.1.60

  ViewVC Help
Powered by ViewVC 1.1.20