/[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.108 Revision 1.120
1# Copyright 1999-2011 Gentoo Foundation 1# Copyright 1999-2012 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.108 2011/12/25 18:49:52 pesa Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.120 2012/02/28 18:53:45 pesa Exp $
4 4
5# @ECLASS: qt4-build.eclass 5# @ECLASS: qt4-build.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Qt herd <qt@gentoo.org> 7# Qt herd <qt@gentoo.org>
8# @BLURB: Eclass for Qt4 split ebuilds. 8# @BLURB: Eclass for Qt4 split ebuilds.
44 !>x11-libs/qt-gui-${PV}-r9999 44 !>x11-libs/qt-gui-${PV}-r9999
45 !<x11-libs/qt-multimedia-${PV} 45 !<x11-libs/qt-multimedia-${PV}
46 !>x11-libs/qt-multimedia-${PV}-r9999 46 !>x11-libs/qt-multimedia-${PV}-r9999
47 !<x11-libs/qt-opengl-${PV} 47 !<x11-libs/qt-opengl-${PV}
48 !>x11-libs/qt-opengl-${PV}-r9999 48 !>x11-libs/qt-opengl-${PV}-r9999
49 !<x11-libs/qt-openvg-${PV}
50 !>x11-libs/qt-openvg-${PV}-r9999
49 !<x11-libs/qt-phonon-${PV} 51 !<x11-libs/qt-phonon-${PV}
50 !>x11-libs/qt-phonon-${PV}-r9999 52 !>x11-libs/qt-phonon-${PV}-r9999
51 !<x11-libs/qt-qt3support-${PV} 53 !<x11-libs/qt-qt3support-${PV}
52 !>x11-libs/qt-qt3support-${PV}-r9999 54 !>x11-libs/qt-qt3support-${PV}-r9999
53 !<x11-libs/qt-script-${PV} 55 !<x11-libs/qt-script-${PV}
66 68
67S=${WORKDIR}/${MY_P} 69S=${WORKDIR}/${MY_P}
68 70
69# @FUNCTION: qt4-build_pkg_setup 71# @FUNCTION: qt4-build_pkg_setup
70# @DESCRIPTION: 72# @DESCRIPTION:
71# Sets up S, MY_P, PATH, and LD_LIBRARY_PATH 73# Sets up PATH and LD_LIBRARY_PATH.
72qt4-build_pkg_setup() { 74qt4-build_pkg_setup() {
73 [[ ${EAPI} == 2 ]] && use !prefix && EPREFIX= 75 [[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
74 76
75 # Protect users by not allowing downgrades between releases 77 # Protect users by not allowing downgrades between releases
76 # Downgrading revisions within the same release should be allowed 78 # Downgrading revisions within the same release should be allowed
109 QT4_EXTRACT_DIRECTORIES="src/gui/kernel/qapplication_mac.mm 111 QT4_EXTRACT_DIRECTORIES="src/gui/kernel/qapplication_mac.mm
110 ${QT4_EXTRACT_DIRECTORIES}" 112 ${QT4_EXTRACT_DIRECTORIES}"
111 fi 113 fi
112 114
113 # Make sure ebuilds use the required EAPI 115 # Make sure ebuilds use the required EAPI
114 if [[ ${EAPI} != [23] ]]; then 116 if [[ ${EAPI} != [234] ]]; then
115 eerror "The qt4-build eclass requires EAPI=2 or EAPI=3, but this ebuild is using" 117 eerror "The qt4-build eclass requires EAPI 2,3 or 4 but this ebuild is using"
116 eerror "EAPI=${EAPI:-0}. The ebuild author or editor failed. This ebuild needs to be" 118 eerror "EAPI=${EAPI:-0}. The ebuild author or editor failed. This ebuild needs to be"
117 eerror "fixed. Using qt4-build eclass without EAPI=2 or EAPI=3 will fail." 119 eerror "fixed. Using qt4-build eclass without EAPI 2,3 or 4 will fail."
118 die "qt4-build eclass requires EAPI=2 or EAPI=3" 120 die "qt4-build eclass requires EAPI 2,3 or 4"
119 fi 121 fi
120 122
121 if ! version_is_at_least 4.1 $(gcc-version); then 123 if ! version_is_at_least 4.1 $(gcc-version); then
122 ewarn "Using a GCC version lower than 4.1 is not supported!" 124 ewarn "Using a GCC version lower than 4.1 is not supported!"
123 fi 125 fi
124} 126}
125 127
126# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES 128# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
127# @DESCRIPTION: 129# @DESCRIPTION:
128# Arguments for build_target_directories. Takes the directories, in which the 130# Arguments for build_target_directories. Takes the directories in which the
129# code should be compiled. This is a space-separated list 131# code should be compiled. This is a space-separated list.
130 132
131# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES 133# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
132# @DESCRIPTION: 134# @DESCRIPTION:
133# Space separated list including the directories that will be extracted from Qt 135# Space-separated list including the directories that will be extracted from
134# tarball 136# Qt tarball.
135 137
136# @FUNCTION: qt4-build_src_unpack 138# @FUNCTION: qt4-build_src_unpack
137# @DESCRIPTION: 139# @DESCRIPTION:
138# Unpacks the sources 140# Unpacks the sources.
139qt4-build_src_unpack() { 141qt4-build_src_unpack() {
140 setqtenv 142 setqtenv
141 local unpack_p="${MY_P}" 143
142 case "${PV}" in 144 local tarball="${MY_P}.tar.gz" target= targets=
143 4.8.0_*)
144 unpack_p="qt-everywhere-opensource-src-${PV/_*}"
145 ;;
146 esac
147 local target targets=
148 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \ 145 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
149 src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \ 146 src/{qbase,qt_targets,qt_install}.pri bin config.tests \
150 ${QT4_EXTRACT_DIRECTORIES}; do 147 mkspecs qmake ${QT4_EXTRACT_DIRECTORIES}
148 do
151 targets+=" ${unpack_p}/${target}" 149 targets+="${MY_P}/${target} "
152 done 150 done
153 151
152 ebegin "Unpacking parts of ${tarball}:" ${targets//${MY_P}\/}
154 echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} 153 tar -xzf "${DISTDIR}/${tarball}" ${targets}
155 tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die 154 eend $? || die "failed to unpack"
156 case "${PV}" in
157 4.8.0_*)
158 mv ${WORKDIR}/qt-everywhere-opensource-src-${PV/_*} \
159 ${WORKDIR}/qt-everywhere-opensource-src-${MY_PV}
160 ;;
161 esac
162} 155}
163 156
164# @ECLASS-VARIABLE: PATCHES 157# @ECLASS-VARIABLE: PATCHES
158# @DEFAULT_UNSET
165# @DESCRIPTION: 159# @DESCRIPTION:
166# In case you have patches to apply, specify them in PATCHES variable. Make sure 160# PATCHES array variable containing all various patches to be applied.
167# to specify the full path. This variable is necessary for src_prepare phase. 161# This variable is expected to be defined in global scope of ebuild.
168# example: 162# Make sure to specify the full path. This variable is utilised in
169# PATCHES="${FILESDIR}"/mypatch.patch 163# src_unpack/src_prepare phase, based on EAPI.
170# ${FILESDIR}"/mypatch2.patch"
171# 164#
165# @CODE
166# PATCHES=( "${FILESDIR}/mypatch.patch"
167# "${FILESDIR}/patches_folder/" )
168# @CODE
172 169
173# @FUNCTION: qt4-build_src_prepare 170# @FUNCTION: qt4-build_src_prepare
174# @DESCRIPTION: 171# @DESCRIPTION:
175# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix 172# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
176# source files in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified on /etc/make.conf. 173# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in /etc/make.conf.
177qt4-build_src_prepare() { 174qt4-build_src_prepare() {
178 setqtenv 175 setqtenv
179 cd "${S}" 176 cd "${S}"
180 177
181 if version_is_at_least "4.7"; then 178 if version_is_at_least "4.7"; then
190 # provide a proper macx-g++-64 187 # provide a proper macx-g++-64
191 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir) 188 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir)
192 189
193 sed -e '/^CONFIG/s:app_bundle::' \ 190 sed -e '/^CONFIG/s:app_bundle::' \
194 -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \ 191 -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \
195 -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed failed" 192 -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
196 fi 193 fi
197 194
198 if [[ ${PN} != qt-core ]]; then 195 if [[ ${PN} != qt-core ]]; then
199 skip_qmake_build 196 skip_qmake_build
200 skip_project_generation 197 skip_project_generation
201 symlink_binaries_to_buildtree 198 symlink_binaries_to_buildtree
202 fi 199 fi
203 200
204 if [[ ${CHOST} == *86*-apple-darwin* ]] ; then 201 if [[ ${CHOST} == *86*-apple-darwin* ]]; then
205 # qmake bus errors with -O2 but -O3 works 202 # qmake bus errors with -O2 but -O3 works
206 replace-flags -O2 -O3 203 replace-flags -O2 -O3
207 fi 204 fi
208 205
209 # Bug 178652 206 # Bug 178652
220 ewarn "disabled." 217 ewarn "disabled."
221 append-flags -std=c++0x 218 append-flags -std=c++0x
222 fi 219 fi
223 220
224 # Unsupported old gcc versions - hardened needs this :( 221 # Unsupported old gcc versions - hardened needs this :(
225 if [[ $(gcc-major-version) -lt 4 ]] ; then 222 if [[ $(gcc-major-version) -lt 4 ]]; then
226 ewarn "Appending -fno-stack-protector to CXXFLAGS" 223 ewarn "Appending -fno-stack-protector to CXXFLAGS"
227 append-cxxflags -fno-stack-protector 224 append-cxxflags -fno-stack-protector
228 # Bug 253127 225 # Bug 253127
229 sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \ 226 sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \
230 -i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed" 227 -i mkspecs/common/g++.conf || die
231 fi 228 fi
232 229
233 # Bug 261632 230 # Bug 261632
234 if use ppc64; then 231 if use ppc64; then
235 ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS" 232 ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS"
236 append-flags -mminimal-toc 233 append-flags -mminimal-toc
237 fi 234 fi
238 235
239 # Bug 282984 && Bug 295530 236 # Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
240 sed -e "s:\(^SYSTEM_VARIABLES\):CC=\"$(tc-getCC)\"\nCXX=\"$(tc-getCXX)\"\nCFLAGS=\"${CFLAGS}\"\nCXXFLAGS=\"${CXXFLAGS}\"\nLDFLAGS=\"${LDFLAGS}\"\n\1:" \ 237 sed -e "/^SYSTEM_VARIABLES=/i \
241 -i configure || die "sed qmake compilers failed" 238 CC='$(tc-getCC)'\n\
239 CXX='$(tc-getCXX)'\n\
240 CFLAGS='${CFLAGS}'\n\
241 CXXFLAGS='${CXXFLAGS}'\n\
242 LDFLAGS='${LDFLAGS}'\n" \
243 -i configure \
244 || die "sed SYSTEM_VARIABLES failed"
242 245
243 # Bug 321335 246 # Respect CC, CXX, LINK and *FLAGS in config.tests
244 if version_is_at_least 4.6; then 247 find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
245 find ./config.tests/unix -name "*.test" -type f -exec grep -lZ \$MAKE '{}' \; | \ 248 sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \
246 xargs -0 \ 249 'QMAKE_CC=$(tc-getCC)' 'QMAKE_CXX=$(tc-getCXX)' 'QMAKE_LINK=$(tc-getCXX)' \
247 sed -e "s:\(\$MAKE\):\1 CC=\"$(tc-getCC)\" CXX=\"$(tc-getCXX)\" LD=\"$(tc-getCXX)\" LINK=\"$(tc-getCXX)\":g" \ 250 'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
248 -i || die "sed test compilers failed" 251 || die "sed config.tests failed"
249 fi 252
253 # Strip predefined CFLAGS from mkspecs (bug 312689)
254 sed -i -e '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf || die
250 255
251 # Bug 172219 256 # Bug 172219
252 sed -e "s:X11R6/::" \ 257 sed -e 's:/X11R6/:/:' -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
253 -i "${S}"/mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed ${S}/mkspecs/$(qt_mkspecs_dir)/qmake.conf failed"
254 258
255 if [[ ${CHOST} == *-darwin* ]]; then 259 if [[ ${CHOST} == *-darwin* ]]; then
256 # Set FLAGS *and* remove -arch, since our gcc-apple is multilib 260 # Set FLAGS *and* remove -arch, since our gcc-apple is multilib
257 # crippled (by design) :/ 261 # crippled (by design) :/
262 sed \
258 sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ 263 -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
259 -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ 264 -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
260 -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=-headerpad_max_install_names ${LDFLAGS}:" \ 265 -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=-headerpad_max_install_names ${LDFLAGS}:" \
261 -e "s:-arch\s\w*::g" \ 266 -e "s:-arch\s\w*::g" \
262 -i mkspecs/common/mac-g++.conf || die "sed mkspecs/common/mac-g++.conf failed" 267 -i mkspecs/common/mac-g++.conf \
268 || die "sed mkspecs/common/mac-g++.conf failed"
263 269
264 # Fix configure's -arch settings that appear in qmake/Makefile and also 270 # Fix configure's -arch settings that appear in qmake/Makefile and also
265 # fix arch handling (automagically duplicates our -arch arg and breaks 271 # fix arch handling (automagically duplicates our -arch arg and breaks
266 # pch). Additionally disable Xarch support. 272 # pch). Additionally disable Xarch support.
267 sed \ 273 sed \
272 -e "s:-arch \$i::" \ 278 -e "s:-arch \$i::" \
273 -e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \ 279 -e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \
274 -e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \ 280 -e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \
275 -e "s:-Xarch_x86_64::g" \ 281 -e "s:-Xarch_x86_64::g" \
276 -e "s:-Xarch_ppc64::g" \ 282 -e "s:-Xarch_ppc64::g" \
277 -i configure mkspecs/common/mac-g++.conf || die "sed configure failed" 283 -i configure mkspecs/common/mac-g++.conf \
284 || die "sed -arch/-Xarch failed"
278 285
279 # On Snow Leopard don't fall back to 10.5 deployment target. 286 # On Snow Leopard don't fall back to 10.5 deployment target.
280 if [[ ${CHOST} == *-apple-darwin10 ]] ; then 287 if [[ ${CHOST} == *-apple-darwin10 ]]; then
281 sed -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \ 288 sed -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \
282 -e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \ 289 -e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \
283 -i configure mkspecs/common/mac-g++.conf || die "sed configure failed" 290 -i configure mkspecs/common/mac-g++.conf \
291 || die "sed deployment target failed"
284 fi 292 fi
285 fi 293 fi
286 294
287 # this one is needed for all systems with a separate -liconv, apart from 295 # this one is needed for all systems with a separate -liconv, apart from
288 # Darwin, for which the sources already cater for -liconv 296 # Darwin, for which the sources already cater for -liconv
289 if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] ; then 297 if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
290 sed \ 298 sed -e 's|mac:\(LIBS += -liconv\)|\1|g' \
291 -e "s|mac:LIBS += -liconv|LIBS += -liconv|g" \
292 -i config.tests/unix/iconv/iconv.pro \ 299 -i config.tests/unix/iconv/iconv.pro \
293 || die "sed on iconv.pro failed" 300 || die "sed iconv.pro failed"
294 fi 301 fi
295 302
296 # we need some patches for Solaris 303 # we need some patches for Solaris
297 sed -i \
298 -e '/^QMAKE_LFLAGS_THREAD/a\QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \ 304 sed -i -e '/^QMAKE_LFLAGS_THREAD/a\QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \
299 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die 305 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
300 # use GCC over SunStudio 306 # use GCC over SunStudio
301 sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die 307 sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die
302 # don't flirt with non-Prefix stuff, we're quite possessive 308 # do not flirt with non-Prefix stuff, we're quite possessive
303 sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \ 309 sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \
304 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die 310 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
305 # strip predefined CFLAGS from qmake ( bug #312689 )
306 sed -i '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf
307 311
308 base_src_prepare 312 base_src_prepare
309} 313}
310 314
311# @FUNCTION: qt4-build_src_configure 315# @FUNCTION: qt4-build_src_configure
315 setqtenv 319 setqtenv
316 myconf="$(standard_configure_options) ${myconf}" 320 myconf="$(standard_configure_options) ${myconf}"
317 321
318 # this one is needed for all systems with a separate -liconv, apart from 322 # this one is needed for all systems with a separate -liconv, apart from
319 # Darwin, for which the sources already cater for -liconv 323 # Darwin, for which the sources already cater for -liconv
320 use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \ 324 if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
321 myconf+=" -liconv" 325 myconf+=" -liconv"
326 fi
322 327
323 if use_if_iuse glib; then 328 if use_if_iuse glib; then
324 # use -I, -L and -l from configure
325 local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)" 329 local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)"
326 # avoid the -pthread argument 330 # avoid the -pthread argument
327 myconf+=" ${glibflags//-pthread}" 331 myconf+=" ${glibflags//-pthread}"
328 unset glibflags 332 unset glibflags
329 fi 333 fi
335 ewarn "disable it before reporting any bugs related to this useflag." 339 ewarn "disable it before reporting any bugs related to this useflag."
336 ewarn 340 ewarn
337 myconf+=" -qpa" 341 myconf+=" -qpa"
338 fi 342 fi
339 343
340 if use aqua ; then 344 if use aqua; then
341 # On (snow) leopard use the new (frameworked) cocoa code. 345 # On (snow) leopard use the new (frameworked) cocoa code.
342 if [[ ${CHOST##*-darwin} -ge 9 ]] ; then 346 if [[ ${CHOST##*-darwin} -ge 9 ]]; then
343 myconf+=" -cocoa -framework" 347 myconf+=" -cocoa -framework"
348 # We need the source's headers, not the installed ones.
349 myconf+=" -I${S}/include"
350 # Add hint for the framework location.
351 myconf+=" -F${QTLIBDIR}"
344 352
345 # We are crazy and build cocoa + qt3support :-) 353 # We are crazy and build cocoa + qt3support :-)
346 if use qt3support; then 354 if use qt3support; then
347 sed -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \ 355 sed -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \
348 -i configure 356 -i configure || die
349 fi 357 fi
350 358 else
351 # We need the source's headers, not the installed ones. 359 myconf+=" -no-framework"
352 myconf+=" -I${S}/include"
353
354 # Add hint for the framework location.
355 myconf+=" -F${QTLIBDIR}"
356 fi 360 fi
357 else 361 else
358 # freetype2 include dir is non-standard, thus include it on configure 362 # freetype2 include dir is non-standard, thus include it on configure
359 # use -I from configure 363 # use -I from configure
360 myconf+=" $(pkg-config --cflags freetype2)" 364 myconf+=" $(pkg-config --cflags freetype2)"
378 382
379# @FUNCTION: qt4-build_src_test 383# @FUNCTION: qt4-build_src_test
380# @DESCRIPTION: 384# @DESCRIPTION:
381# Runs tests only in target directories. 385# Runs tests only in target directories.
382qt4-build_src_test() { 386qt4-build_src_test() {
387 # QtMultimedia does not have any test suite (bug #332299)
388 [[ ${PN} == "qt-multimedia" ]] && return
389
383 for dir in ${QT4_TARGET_DIRECTORIES}; do 390 for dir in ${QT4_TARGET_DIRECTORIES}; do
384 emake -j1 check -C ${dir} 391 emake -j1 check -C ${dir}
385 done 392 done
386} 393}
387 394
388# @FUNCTION: fix_includes 395# @FUNCTION: fix_includes
389# @DESCRIPTION: 396# @DESCRIPTION:
390# For MacOSX we need to add some symlinks when frameworks are 397# For MacOS X we need to add some symlinks when frameworks are
391# being used, to avoid complications with some more or less stupid packages. 398# being used, to avoid complications with some more or less stupid packages.
392fix_includes() { 399fix_includes() {
393 if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then 400 if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
394 # Some packages tend to include <Qt/...> 401 # Some packages tend to include <Qt/...>
395 dodir "${QTHEADERDIR#${EPREFIX}}"/Qt 402 dodir "${QTHEADERDIR#${EPREFIX}}"/Qt
396 403
397 # Fake normal headers when frameworks are installed... eases life later on 404 # Fake normal headers when frameworks are installed... eases life later on
398 local dest f 405 local dest f h
399 for frw in "${D}${QTLIBDIR}"/*.framework; do 406 for frw in "${D}${QTLIBDIR}"/*.framework; do
400 [[ -e "${frw}"/Headers ]] || continue 407 [[ -e "${frw}"/Headers ]] || continue
401 f=$(basename ${frw}) 408 f=$(basename ${frw})
402 dest="${QTHEADERDIR#${EPREFIX}}"/${f%.framework} 409 dest="${QTHEADERDIR#${EPREFIX}}"/${f%.framework}
403 dosym "${QTLIBDIR#${EPREFIX}}"/${f}/Headers "${dest}" 410 dosym "${QTLIBDIR#${EPREFIX}}"/${f}/Headers "${dest}"
422 install_qconfigs 429 install_qconfigs
423 fix_library_files 430 fix_library_files
424 fix_includes 431 fix_includes
425 432
426 # remove .la files since we are building only shared Qt libraries 433 # remove .la files since we are building only shared Qt libraries
427 find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm 434 find "${D}"${QTLIBDIR} -type f -name '*.la' -print0 | xargs -0 rm -f
428} 435}
429 436
430# @FUNCTION: setqtenv 437# @FUNCTION: setqtenv
438# @INTERNAL
431setqtenv() { 439setqtenv() {
432 # Set up installation directories 440 # Set up installation directories
433 QTBASEDIR=${EPREFIX}/usr/$(get_libdir)/qt4
434 QTPREFIXDIR=${EPREFIX}/usr 441 QTPREFIXDIR=${EPREFIX}/usr
435 QTBINDIR=${EPREFIX}/usr/bin 442 QTBINDIR=${EPREFIX}/usr/bin
436 QTLIBDIR=${EPREFIX}/usr/$(get_libdir)/qt4 443 QTLIBDIR=${EPREFIX}/usr/$(get_libdir)/qt4
437 QMAKE_LIBDIR_QT=${QTLIBDIR}
438 QTPCDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig 444 QTPCDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig
439 QTDATADIR=${EPREFIX}/usr/share/qt4
440 QTDOCDIR=${EPREFIX}/usr/share/doc/qt-${PV} 445 QTDOCDIR=${EPREFIX}/usr/share/doc/qt-${PV}
441 QTHEADERDIR=${EPREFIX}/usr/include/qt4 446 QTHEADERDIR=${EPREFIX}/usr/include/qt4
442 QTPLUGINDIR=${QTLIBDIR}/plugins 447 QTPLUGINDIR=${QTLIBDIR}/plugins
443 QTIMPORTDIR=${QTLIBDIR}/imports 448 QTIMPORTDIR=${QTLIBDIR}/imports
449 QTDATADIR=${EPREFIX}/usr/share/qt4
450 QTTRANSDIR=${QTDATADIR}/translations
444 QTSYSCONFDIR=${EPREFIX}/etc/qt4 451 QTSYSCONFDIR=${EPREFIX}/etc/qt4
445 QTTRANSDIR=${QTDATADIR}/translations
446 QTEXAMPLESDIR=${QTDATADIR}/examples 452 QTEXAMPLESDIR=${QTDATADIR}/examples
447 QTDEMOSDIR=${QTDATADIR}/demos 453 QTDEMOSDIR=${QTDATADIR}/demos
454 QMAKE_LIBDIR_QT=${QTLIBDIR}
448 QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4 455 QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4
456
449 PLATFORM=$(qt_mkspecs_dir) 457 PLATFORM=$(qt_mkspecs_dir)
450 458
451 unset QMAKESPEC 459 unset QMAKESPEC
452} 460}
453 461
454# @FUNCTION: standard_configure_options 462# @FUNCTION: standard_configure_options
463# @INTERNAL
455# @DESCRIPTION: 464# @DESCRIPTION:
456# Sets up some standard configure options, like libdir (if necessary), whether 465# Sets up some standard configure options, like libdir (if necessary), whether
457# debug info is wanted or not. 466# debug info is wanted or not.
458standard_configure_options() { 467standard_configure_options() {
468 local myconf="
459 local myconf="-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} 469 -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
460 -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} 470 -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR}
461 -importdir ${QTIMPORTDIR} -datadir ${QTDATADIR} -translationdir ${QTTRANSDIR} 471 $(version_is_at_least 4.7 && echo -importdir ${QTIMPORTDIR})
472 -datadir ${QTDATADIR} -translationdir ${QTTRANSDIR} -sysconfdir ${QTSYSCONFDIR}
462 -sysconfdir ${QTSYSCONFDIR} -examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} 473 -examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR}
463 -opensource -confirm-license -shared -fast -largefile -stl -verbose 474 -opensource -confirm-license -shared -fast -largefile -stl -verbose
464 -platform $(qt_mkspecs_dir) -nomake examples -nomake demos" 475 -platform $(qt_mkspecs_dir) -nomake examples -nomake demos"
465 476
466 [[ $(get_libdir) != lib ]] && myconf+=" -L${EPREFIX}/usr/$(get_libdir)" 477 [[ $(get_libdir) != lib ]] && myconf+=" -L${EPREFIX}/usr/$(get_libdir)"
467 478
472 myconf+=" -release" 483 myconf+=" -release"
473 fi 484 fi
474 myconf+=" -no-separate-debug-info" 485 myconf+=" -no-separate-debug-info"
475 486
476 # exceptions USE flag 487 # exceptions USE flag
477 local exceptions="-exceptions" 488 myconf+=" $(in_iuse exceptions && qt_use exceptions || echo -exceptions)"
478 in_iuse exceptions && exceptions="$(qt_use exceptions)"
479 myconf+=" ${exceptions}"
480 489
481 # disable RPATH on Qt >= 4.8 (bug 380415) 490 # disable RPATH on Qt >= 4.8 (bug 380415)
482 version_is_at_least 4.8 && myconf+=" -no-rpath" 491 version_is_at_least 4.8 && myconf+=" -no-rpath"
483 492
484 # precompiled headers don't work on hardened, where the flag is masked 493 # precompiled headers don't work on hardened, where the flag is masked
488 # This flag seems to introduce major breakage to applications, 497 # This flag seems to introduce major breakage to applications,
489 # mostly to be seen as a core dump with the message "QPixmap: Must 498 # mostly to be seen as a core dump with the message "QPixmap: Must
490 # construct a QApplication before a QPaintDevice" on Solaris. 499 # construct a QApplication before a QPaintDevice" on Solaris.
491 # -- Daniel Vergien 500 # -- Daniel Vergien
492 [[ ${CHOST} != *-solaris* ]] && myconf+=" -reduce-relocations" 501 [[ ${CHOST} != *-solaris* ]] && myconf+=" -reduce-relocations"
493
494 use aqua && myconf+=" -no-framework"
495 502
496 # ARCH is set on Gentoo. Qt now falls back to generic on an unsupported 503 # ARCH is set on Gentoo. Qt now falls back to generic on an unsupported
497 # $(tc-arch). Therefore we convert it to supported values. 504 # $(tc-arch). Therefore we convert it to supported values.
498 case "$(tc-arch)" in 505 case "$(tc-arch)" in
499 amd64|x64-*) myconf+=" -arch x86_64" ;; 506 amd64|x64-*) myconf+=" -arch x86_64" ;;
510 echo "${myconf}" 517 echo "${myconf}"
511} 518}
512 519
513# @FUNCTION: prepare_directories 520# @FUNCTION: prepare_directories
514# @USAGE: < directories > 521# @USAGE: < directories >
522# @INTERNAL
515# @DESCRIPTION: 523# @DESCRIPTION:
516# Generates makefiles for the directories set in $QT4_TARGET_DIRECTORIES 524# Generates Makefiles for the given list of directories.
517prepare_directories() { 525prepare_directories() {
518 for x in "$@"; do 526 for x in "$@"; do
519 pushd "${S}"/${x} >/dev/null 527 pushd "${S}"/${x} >/dev/null || die
520 einfo "Running qmake in: ${x}" 528 einfo "Running qmake in: ${x}"
521 # avoid running over the maximum argument number, bug #299810 529 # avoid running over the maximum argument number, bug #299810
522 { 530 {
523 echo "${S}"/mkspecs/common/*.conf 531 echo "${S}"/mkspecs/common/*.conf
524 find "${S}" -name '*.pr[io]' 532 find "${S}" -name '*.pr[io]'
525 } | xargs sed -i \ 533 } | xargs sed -i \
526 -e "s:\$\$\[QT_INSTALL_LIBS\]:${QTLIBDIR}:g" \ 534 -e "s:\$\$\[QT_INSTALL_LIBS\]:${QTLIBDIR}:g" \
527 -e "s:\$\$\[QT_INSTALL_PLUGINS\]:${QTPLUGINDIR}:g" \ 535 -e "s:\$\$\[QT_INSTALL_PLUGINS\]:${QTPLUGINDIR}:g" \
528 || die 536 || die
529 "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed" 537 "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
530 popd >/dev/null 538 popd >/dev/null || die
531 done 539 done
532} 540}
533 541
534 542
535# @FUNCTION: build_directories 543# @FUNCTION: build_directories
536# @USAGE: < directories > 544# @USAGE: < directories >
545# @INTERNAL
537# @DESCRIPTION: 546# @DESCRIPTION:
538# Compiles the code in $QT4_TARGET_DIRECTORIES 547# Compiles the code in the given list of directories.
539build_directories() { 548build_directories() {
540 for x in "$@"; do 549 for x in "$@"; do
541 pushd "${S}"/${x} >/dev/null 550 pushd "${S}"/${x} >/dev/null || die
542 emake CC="$(tc-getCC)" \ 551 emake CC="$(tc-getCC)" \
543 CXX="$(tc-getCXX)" \ 552 CXX="$(tc-getCXX)" \
544 LINK="$(tc-getCXX)" || die "emake failed" 553 LINK="$(tc-getCXX)" || die "emake failed"
545 popd >/dev/null 554 popd >/dev/null || die
546 done 555 done
547} 556}
548 557
549# @FUNCTION: install_directories 558# @FUNCTION: install_directories
550# @USAGE: < directories > 559# @USAGE: < directories >
560# @INTERNAL
551# @DESCRIPTION: 561# @DESCRIPTION:
552# run emake install in the given directories, which are separated by spaces 562# Runs emake install in the given directories, which are separated by spaces.
553install_directories() { 563install_directories() {
554 for x in "$@"; do 564 for x in "$@"; do
555 pushd "${S}"/${x} >/dev/null || die "Can't pushd ${S}/${x}" 565 pushd "${S}"/${x} >/dev/null || die
556 emake INSTALL_ROOT="${D}" install || die "emake install failed" 566 emake INSTALL_ROOT="${D}" install || die "emake install failed"
557 popd >/dev/null || die "Can't popd from ${S}/${x}" 567 popd >/dev/null || die
558 done 568 done
559} 569}
560 570
561# @ECLASS-VARIABLE: QCONFIG_ADD 571# @ECLASS-VARIABLE: QCONFIG_ADD
562# @DESCRIPTION: 572# @DESCRIPTION:
572# @DESCRIPTION: 582# @DESCRIPTION:
573# List variables that should be defined at the top of QtCore/qconfig.h 583# List variables that should be defined at the top of QtCore/qconfig.h
574: ${QCONFIG_DEFINE:=} 584: ${QCONFIG_DEFINE:=}
575 585
576# @FUNCTION: install_qconfigs 586# @FUNCTION: install_qconfigs
587# @INTERNAL
577# @DESCRIPTION: 588# @DESCRIPTION:
578# Install gentoo-specific mkspecs configurations 589# Install gentoo-specific mkspecs configurations.
579install_qconfigs() { 590install_qconfigs() {
580 local x 591 local x
581 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then 592 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
582 for x in QCONFIG_ADD QCONFIG_REMOVE; do 593 for x in QCONFIG_ADD QCONFIG_REMOVE; do
583 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri 594 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
594 doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed" 605 doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed"
595 fi 606 fi
596} 607}
597 608
598# @FUNCTION: generate_qconfigs 609# @FUNCTION: generate_qconfigs
610# @INTERNAL
599# @DESCRIPTION: 611# @DESCRIPTION:
600# Generates gentoo-specific configurations 612# Generates gentoo-specific qconfig.{h,pri}.
601generate_qconfigs() { 613generate_qconfigs() {
602 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then 614 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then
603 local x qconfig_add qconfig_remove qconfig_new 615 local x qconfig_add qconfig_remove qconfig_new
604 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do 616 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
605 [[ -f ${x} ]] || continue 617 [[ -f ${x} ]] || continue
654 fi 666 fi
655} 667}
656 668
657# @FUNCTION: qt4-build_pkg_postrm 669# @FUNCTION: qt4-build_pkg_postrm
658# @DESCRIPTION: 670# @DESCRIPTION:
659# Generate configurations when the package is completely removed 671# Regenerate configuration when the package is completely removed.
660qt4-build_pkg_postrm() { 672qt4-build_pkg_postrm() {
661 generate_qconfigs 673 generate_qconfigs
662} 674}
663 675
664# @FUNCTION: qt4-build_pkg_postinst 676# @FUNCTION: qt4-build_pkg_postinst
665# @DESCRIPTION: 677# @DESCRIPTION:
666# Generate configuration, plus throws a message about possible 678# Regenerate configuration, plus throw a message about possible
667# breakages and proposed solutions. 679# breakages and proposed solutions.
668qt4-build_pkg_postinst() { 680qt4-build_pkg_postinst() {
669 generate_qconfigs 681 generate_qconfigs
670} 682}
671 683
672# @FUNCTION: skip_qmake_build 684# @FUNCTION: skip_qmake_build
685# @INTERNAL
673# @DESCRIPTION: 686# @DESCRIPTION:
674# Don't need to build qmake, as it's already installed from qt-core 687# Patches configure to skip qmake compilation, as it's already installed by qt-core.
675skip_qmake_build() { 688skip_qmake_build() {
676 # Don't need to build qmake, as it's already installed from qt-core
677 sed -i -e "s:if true:if false:g" "${S}"/configure || die "sed failed" 689 sed -i -e "s:if true:if false:g" "${S}"/configure || die
678} 690}
679 691
680# @FUNCTION: skip_project_generation 692# @FUNCTION: skip_project_generation
693# @INTERNAL
681# @DESCRIPTION: 694# @DESCRIPTION:
682# Exit the script early by throwing in an exit before all of the .pro files are scanned 695# Exit the script early by throwing in an exit before all of the .pro files are scanned.
683skip_project_generation() { 696skip_project_generation() {
684 # Exit the script early by throwing in an exit before all of the .pro files are scanned
685 sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \ 697 sed -i -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" "${S}"/configure || die
686 -i "${S}"/configure || die "sed failed"
687} 698}
688 699
689# @FUNCTION: symlink_binaries_to_buildtree 700# @FUNCTION: symlink_binaries_to_buildtree
701# @INTERNAL
690# @DESCRIPTION: 702# @DESCRIPTION:
691# Symlink generated binaries to buildtree so they can be used during compilation 703# Symlinks generated binaries to buildtree, so they can be used during compilation time.
692# time
693symlink_binaries_to_buildtree() { 704symlink_binaries_to_buildtree() {
694 for bin in qmake moc uic rcc; do 705 for bin in qmake moc uic rcc; do
695 ln -s "${QTBINDIR}"/${bin} "${S}"/bin/ || die "symlinking ${bin} to ${S}/bin failed" 706 ln -s "${QTBINDIR}"/${bin} "${S}"/bin/ || die "symlinking ${bin} to ${S}/bin failed"
696 done 707 done
697} 708}
698 709
699# @FUNCTION: fix_library_files 710# @FUNCTION: fix_library_files
711# @INTERNAL
700# @DESCRIPTION: 712# @DESCRIPTION:
701# Fixes the pathes in *.la, *.prl, *.pc, as they are wrong due to sandbox and 713# Fixes the paths in *.la, *.prl, *.pc, as they are wrong due to sandbox and
702# moves the *.pc-files into the pkgconfig directory 714# moves the *.pc files into the pkgconfig directory.
703fix_library_files() { 715fix_library_files() {
716 local libfile
704 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do 717 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do
705 if [[ -e ${libfile} ]]; then 718 if [[ -e ${libfile} ]]; then
706 sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "sed on ${libfile} failed" 719 sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "sed on ${libfile} failed"
707 fi 720 fi
708 done 721 done
709 722
710 # pkgconfig files refer to WORKDIR/bin as the moc and uic locations. Fix: 723 # pkgconfig files refer to WORKDIR/bin as the moc and uic locations
711 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do 724 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do
712 if [[ -e ${libfile} ]]; then 725 if [[ -e ${libfile} ]]; then
713 sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "sed failed" 726 sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "sed on ${libfile} failed"
714 727
715 # Move .pc files into the pkgconfig directory 728 # Move .pc files into the pkgconfig directory
716 dodir ${QTPCDIR#${EPREFIX}} 729 dodir ${QTPCDIR#${EPREFIX}}
717 mv ${libfile} "${D}"/${QTPCDIR}/ \ 730 mv ${libfile} "${D}"/${QTPCDIR}/ || die "moving ${libfile} to ${D}/${QTPCDIR}/ failed"
718 || die "moving ${libfile} to ${D}/${QTPCDIR}/ failed"
719 fi 731 fi
720 done 732 done
721 733
722 # Don't install an empty directory 734 # Don't install an empty directory
723 rmdir "${D}"/${QTLIBDIR}/pkgconfig 735 rmdir "${D}"/${QTLIBDIR}/pkgconfig
724} 736}
725 737
726# @FUNCTION: qt_use 738# @FUNCTION: qt_use
727# @USAGE: < flag > [ feature ] [ enableval ] 739# @USAGE: < flag > [ feature ] [ enableval ]
728# @DESCRIPTION: 740# @DESCRIPTION:
729# This will echo "${enableval}-${feature}" if <flag> is enabled, or 741# This will echo "-${enableval}-${feature}" if <flag> is enabled, or
730# "-no-${feature} if the flag is disabled. If [feature] is not specified <flag> 742# "-no-${feature}" if it's disabled. If [feature] is not specified, <flag>
731# will be used for that. If [enableval] is not specified, it omits the 743# will be used for that. If [enableval] is not specified, it omits the
732# assignment-part 744# "-${enableval}" part.
733qt_use() { 745qt_use() {
734 local flag=$1 746 use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
735 local feature=$1
736 local enableval=
737
738 [[ -n $2 ]] && feature=$2
739 [[ -n $3 ]] && enableval=-$3
740
741 if use ${flag}; then
742 echo "${enableval}-${feature}"
743 else
744 echo "-no-${feature}"
745 fi
746} 747}
747 748
748# @FUNCTION: qt_mkspecs_dir 749# @FUNCTION: qt_mkspecs_dir
749# @RETURN: the specs-directory w/o path 750# @RETURN: the specs-directory w/o path
750# @DESCRIPTION: 751# @DESCRIPTION:
751# Allows us to define which mkspecs dir we want to use. 752# Allows us to define which mkspecs dir we want to use.
752qt_mkspecs_dir() { 753qt_mkspecs_dir() {
753 # Allows us to define which mkspecs dir we want to use.
754 local spec 754 local spec=
755
756 case ${CHOST} in 755 case ${CHOST} in
757 *-freebsd*|*-dragonfly*) 756 *-freebsd*|*-dragonfly*)
758 spec=freebsd ;; 757 spec=freebsd ;;
759 *-openbsd*) 758 *-openbsd*)
760 spec=openbsd ;; 759 spec=openbsd ;;
783 elif [[ ${CXX} == *icpc* ]]; then 782 elif [[ ${CXX} == *icpc* ]]; then
784 spec+=-icc 783 spec+=-icc
785 else 784 else
786 die "Unknown compiler '${CXX}'" 785 die "Unknown compiler '${CXX}'"
787 fi 786 fi
788 if [[ -n ${LIBDIR/lib} ]]; then
789 spec+=-${LIBDIR/lib}
790 fi
791 787
792 # Add -64 for 64bit profiles 788 # Add -64 for 64bit profiles
793 if use x64-freebsd || 789 if use x64-freebsd ||
794 use amd64-linux || 790 use amd64-linux ||
795 use x64-macos || 791 use x64-macos ||
801 797
802 echo "${spec}" 798 echo "${spec}"
803} 799}
804 800
805# @FUNCTION: qt_assistant_cleanup 801# @FUNCTION: qt_assistant_cleanup
806# @RETURN: nothing 802# @INTERNAL
807# @DESCRIPTION: 803# @DESCRIPTION:
808# Tries to clean up tools.pro for qt-assistant ebuilds. 804# Tries to clean up tools.pro for qt-assistant ebuilds.
809# Meant to be called in src_prepare(). 805# Meant to be called in src_prepare().
810# Since Qt 4.7.4 this function is a no-op. 806# Since Qt 4.7.4 this function is a no-op.
811qt_assistant_cleanup() { 807qt_assistant_cleanup() {
831 ;; 827 ;;
832 esac 828 esac
833} 829}
834 830
835# @FUNCTION: qt_nolibx11 831# @FUNCTION: qt_nolibx11
836# @RETURN: nothing 832# @INTERNAL
837# @DESCRIPTION: 833# @DESCRIPTION:
838# Ignore X11 tests for packages that don't need X libraries installed 834# Ignore X11 tests for packages that don't need X libraries installed.
839qt_nolibx11() { 835qt_nolibx11() {
840 einfo "Removing X11 check to allow X-less compilation"
841 sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure || 836 sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure ||
842 die "x11 check sed failed" 837 die "x11 check sed failed"
843} 838}
844 839
845EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst 840EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst

Legend:
Removed from v.1.108  
changed lines
  Added in v.1.120

  ViewVC Help
Powered by ViewVC 1.1.20