/[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.92 Revision 1.109
1# Copyright 1999-2009 Gentoo Foundation 1# Copyright 1999-2011 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.92 2011/08/13 11:31:03 hwoarang Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.109 2011/12/26 00:11:07 pesa 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# Qt herd <qt@gentoo.org>
8# Markos Chandras <hwoarang@gentoo.org>,
9# Caleb Tennis <caleb@gentoo.org>
10# Alex Alexander <wired@gentoo.org>
11# @BLURB: Eclass for Qt4 split ebuilds. 8# @BLURB: Eclass for Qt4 split ebuilds.
12# @DESCRIPTION: 9# @DESCRIPTION:
13# This eclass contains various functions that are used when building Qt4 10# This eclass contains various functions that are used when building Qt4.
14 11
15inherit base eutils multilib toolchain-funcs flag-o-matic versionator 12inherit base eutils multilib toolchain-funcs flag-o-matic versionator
16 13
17MY_PV=${PV/_/-} 14MY_PV=${PV/_/-}
18if version_is_at_least 4.5.99999999; then
19 MY_P=qt-everywhere-opensource-src-${MY_PV} 15MY_P=qt-everywhere-opensource-src-${MY_PV}
16
17HOMEPAGE="http://qt.nokia.com/ http://qt-project.org/"
18SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
19LICENSE="|| ( LGPL-2.1 GPL-3 )"
20
21IUSE="aqua debug pch"
22
20 [[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] && 23[[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] &&
21 [[ ${CATEGORY}/${PN} != x11-themes/qgtkstyle ]] && 24[[ ${CATEGORY}/${PN} != x11-themes/qgtkstyle ]] &&
22 IUSE="+exceptions" 25 IUSE+=" +exceptions"
23else 26
24 MY_P=qt-x11-opensource-src-${MY_PV} 27if version_is_at_least 4.7.99999999; then
28 IUSE+=" c++0x qpa"
25fi 29fi
26 30
27HOMEPAGE="http://qt.nokia.com/" 31DEPEND="dev-util/pkgconfig"
28SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
29
30LICENSE="|| ( LGPL-2.1 GPL-3 )"
31IUSE+=" debug pch aqua"
32
33RDEPEND=" 32RDEPEND="
34 !<x11-libs/qt-assistant-${PV} 33 !<x11-libs/qt-assistant-${PV}
35 !>x11-libs/qt-assistant-${PV}-r9999 34 !>x11-libs/qt-assistant-${PV}-r9999
36 !<x11-libs/qt-core-${PV} 35 !<x11-libs/qt-core-${PV}
37 !>x11-libs/qt-core-${PV}-r9999 36 !>x11-libs/qt-core-${PV}-r9999
38 !<x11-libs/qt-dbus-${PV} 37 !<x11-libs/qt-dbus-${PV}
39 !>x11-libs/qt-dbus-${PV}-r9999 38 !>x11-libs/qt-dbus-${PV}-r9999
39 !<x11-libs/qt-declarative-${PV}
40 !>x11-libs/qt-declarative-${PV}-r9999
40 !<x11-libs/qt-demo-${PV} 41 !<x11-libs/qt-demo-${PV}
41 !>x11-libs/qt-demo-${PV}-r9999 42 !>x11-libs/qt-demo-${PV}-r9999
42 !<x11-libs/qt-gui-${PV} 43 !<x11-libs/qt-gui-${PV}
43 !>x11-libs/qt-gui-${PV}-r9999 44 !>x11-libs/qt-gui-${PV}-r9999
44 !<x11-libs/qt-multimedia-${PV} 45 !<x11-libs/qt-multimedia-${PV}
65 66
66S=${WORKDIR}/${MY_P} 67S=${WORKDIR}/${MY_P}
67 68
68# @FUNCTION: qt4-build_pkg_setup 69# @FUNCTION: qt4-build_pkg_setup
69# @DESCRIPTION: 70# @DESCRIPTION:
70# Sets up S, MY_P, PATH, and LD_LIBRARY_PATH 71# Sets up PATH and LD_LIBRARY_PATH.
71qt4-build_pkg_setup() { 72qt4-build_pkg_setup() {
72 [[ ${EAPI} == 2 ]] && use !prefix && EPREFIX= 73 [[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
73 74
74 # Protect users by not allowing downgrades between releases 75 # Protect users by not allowing downgrades between releases
75 # Downgrading revisions within the same release should be allowed 76 # Downgrading revisions within the same release should be allowed
76 if has_version '>'${CATEGORY}/${P}-r9999 ; then 77 if has_version '>'${CATEGORY}/${P}-r9999; then
77 if [[ -z $I_KNOW_WHAT_I_AM_DOING ]] ; then 78 if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
78 eerror "Sanity check to keep you from breaking your system:" 79 eerror "Sanity check to keep you from breaking your system:"
79 eerror " Downgrading Qt is completely unsupported and will break your system!" 80 eerror " Downgrading Qt is completely unsupported and will break your system!"
80 die "aborting to save your system" 81 die "aborting to save your system"
81 else 82 else
82 ewarn "Downgrading Qt is completely unsupported and will break your system!" 83 ewarn "Downgrading Qt is completely unsupported and will break your system!"
83 fi 84 fi
84 fi 85 fi
85 86
86 if [[ "${PN}" == "qt-webkit" ]]; then 87 if [[ ${PN} == "qt-webkit" ]]; then
87 eshopts_push -s extglob 88 eshopts_push -s extglob
88 if is-flagq '-g?(gdb)?([1-9])'; then 89 if is-flagq '-g?(gdb)?([1-9])'; then
89 echo 90 echo
90 ewarn "You have enabled debug info (probably have -g or -ggdb in your \$C{,XX}FLAGS)." 91 ewarn "You have enabled debug info (probably have -g or -ggdb in your \$C{,XX}FLAGS)."
91 ewarn "You may experience really long compilation times and/or increased memory usage." 92 ewarn "You may experience really long compilation times and/or increased memory usage."
122 fi 123 fi
123} 124}
124 125
125# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES 126# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
126# @DESCRIPTION: 127# @DESCRIPTION:
127# Arguments for build_target_directories. Takes the directories, in which the 128# Arguments for build_target_directories. Takes the directories in which the
128# code should be compiled. This is a space-separated list 129# code should be compiled. This is a space-separated list.
129 130
130# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES 131# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
131# @DESCRIPTION: 132# @DESCRIPTION:
132# Space separated list including the directories that will be extracted from Qt 133# Space-separated list including the directories that will be extracted from
133# tarball 134# Qt tarball.
134 135
135# @FUNCTION: qt4-build_src_unpack 136# @FUNCTION: qt4-build_src_unpack
136# @DESCRIPTION: 137# @DESCRIPTION:
137# Unpacks the sources 138# Unpacks the sources.
138qt4-build_src_unpack() { 139qt4-build_src_unpack() {
139 setqtenv 140 setqtenv
140 local unpack_p="${MY_P}"
141 case "${PV}" in
142 4.8.0_beta*)
143 unpack_p="qt-everywhere-opensource-src-${PV/_*}"
144 ;;
145 esac
146 local target targets= 141 local target targets=
147 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \ 142 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
148 src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \ 143 src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \
149 ${QT4_EXTRACT_DIRECTORIES}; do 144 ${QT4_EXTRACT_DIRECTORIES}; do
150 targets+=" ${unpack_p}/${target}" 145 targets+=" ${MY_P}/${target}"
151 done 146 done
152 147
153 echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} 148 echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets}
154 tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die 149 tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die
155 case "${PV}" in
156 4.8.0_beta*)
157 mv ${WORKDIR}/qt-everywhere-opensource-src-${PV/_*} \
158 ${WORKDIR}/qt-everywhere-opensource-src-${MY_PV}
159 ;;
160 esac
161} 150}
162 151
163# @ECLASS-VARIABLE: PATCHES 152# @ECLASS-VARIABLE: PATCHES
164# @DESCRIPTION: 153# @DESCRIPTION:
165# In case you have patches to apply, specify them in PATCHES variable. Make sure 154# In case you have patches to apply, specify them in PATCHES variable. Make sure
166# to specify the full path. This variable is necessary for src_prepare phase. 155# to specify the full path. This variable is necessary for src_prepare phase.
167# example: 156# Example:
168# PATCHES="${FILESDIR}"/mypatch.patch 157# PATCHES="${FILESDIR}"/mypatch.patch
169# ${FILESDIR}"/mypatch2.patch" 158# ${FILESDIR}"/mypatch2.patch"
170# 159#
171 160
172# @FUNCTION: qt4-build_src_prepare 161# @FUNCTION: qt4-build_src_prepare
173# @DESCRIPTION: 162# @DESCRIPTION:
174# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix 163# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
175# source files in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified on /etc/make.conf. 164# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in /etc/make.conf.
176qt4-build_src_prepare() { 165qt4-build_src_prepare() {
177 setqtenv 166 setqtenv
178 cd "${S}" 167 cd "${S}"
179 168
180 # fix qt 4.7 regression that skips -fvisibility=hidden
181 if version_is_at_least "4.7.0_beta1"; then 169 if version_is_at_least "4.7"; then
182 sed -e "s/^gcc|g++)/*gcc|*g++)/" \
183 -i config.tests/unix/fvisibility.test ||
184 die "visibility fixing sed failed"
185 fi
186 # fix libx11 dependency on non X packages 170 # fix libX11 dependency on non X packages
187 if version_is_at_least "4.7.0_beta2"; then
188 local NOLIBX11PKG="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns" 171 local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"
189 has ${PN} ${NOLIBX11PKG} && qt_nolibx11 172 has ${PN} ${nolibx11_pkgs} && qt_nolibx11
190 [[ ${PN} == "qt-assistant" ]] && qt_assistant_cleanup 173
174 qt_assistant_cleanup
191 fi 175 fi
192 176
193 if use aqua; then 177 if use aqua; then
194 # provide a proper macx-g++-64 178 # provide a proper macx-g++-64
195 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir) 179 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir)
196 180
197 sed -e '/^CONFIG/s:app_bundle::' \ 181 sed -e '/^CONFIG/s:app_bundle::' \
198 -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \ 182 -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \
199 -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed failed" 183 -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
200 fi 184 fi
201 185
202 if [[ ${PN} != qt-core ]]; then 186 if [[ ${PN} != qt-core ]]; then
203 skip_qmake_build_patch 187 skip_qmake_build
204 skip_project_generation_patch 188 skip_project_generation
205 symlink_binaries_to_buildtree 189 symlink_binaries_to_buildtree
206 fi 190 fi
207 191
208 if [[ ${CHOST} == *86*-apple-darwin* ]] ; then 192 if [[ ${CHOST} == *86*-apple-darwin* ]] ; then
209 # qmake bus errors with -O2 but -O3 works 193 # qmake bus errors with -O2 but -O3 works
212 196
213 # Bug 178652 197 # Bug 178652
214 if [[ $(gcc-major-version) == 3 ]] && use amd64; then 198 if [[ $(gcc-major-version) == 3 ]] && use amd64; then
215 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS" 199 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
216 append-flags -fno-gcse 200 append-flags -fno-gcse
201 fi
202
203 if use_if_iuse c++0x; then
204 ewarn "You are about to build Qt4 using the C++11 standard. Even though"
205 ewarn "this is an official standard, some of the reverse dependencies"
206 ewarn "may fail to compile or link againt the Qt4 libraries. Before"
207 ewarn "reporting a bug, make sure your bug is reproducible with c++0x"
208 ewarn "disabled."
209 append-flags -std=c++0x
217 fi 210 fi
218 211
219 # Unsupported old gcc versions - hardened needs this :( 212 # Unsupported old gcc versions - hardened needs this :(
220 if [[ $(gcc-major-version) -lt 4 ]] ; then 213 if [[ $(gcc-major-version) -lt 4 ]] ; then
221 ewarn "Appending -fno-stack-protector to CXXFLAGS" 214 ewarn "Appending -fno-stack-protector to CXXFLAGS"
222 append-cxxflags -fno-stack-protector 215 append-cxxflags -fno-stack-protector
223 # Bug 253127 216 # Bug 253127
224 sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \ 217 sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \
225 -i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed" 218 -i mkspecs/common/g++.conf || die
226 fi 219 fi
227 220
228 # Bug 261632 221 # Bug 261632
229 if use ppc64; then 222 if use ppc64; then
230 ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS" 223 ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS"
231 append-flags -mminimal-toc 224 append-flags -mminimal-toc
232 fi 225 fi
233 226
234 # Bug 282984 && Bug 295530 227 # Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
235 sed -e "s:\(^SYSTEM_VARIABLES\):CC=\"$(tc-getCC)\"\nCXX=\"$(tc-getCXX)\"\nCFLAGS=\"${CFLAGS}\"\nCXXFLAGS=\"${CXXFLAGS}\"\nLDFLAGS=\"${LDFLAGS}\"\n\1:" \ 228 sed -e "/^SYSTEM_VARIABLES=/i \
236 -i configure || die "sed qmake compilers failed" 229 CC='$(tc-getCC)'\n\
230 CXX='$(tc-getCXX)'\n\
231 CFLAGS='${CFLAGS}'\n\
232 CXXFLAGS='${CXXFLAGS}'\n\
233 LDFLAGS='${LDFLAGS}'\n" \
234 -i configure || die "sed SYSTEM_VARIABLES failed"
235
237 # bug 321335 236 # Bug 321335
238 if version_is_at_least 4.6; then
239 find ./config.tests/unix -name "*.test" -type f -exec grep -lZ \$MAKE '{}' \; | \ 237 find config.tests/unix -name '*.test' -type f -exec grep -lZ \$MAKE '{}' \; | xargs -0 \
240 xargs -0 \
241 sed -e "s:\(\$MAKE\):\1 CC=\"$(tc-getCC)\" CXX=\"$(tc-getCXX)\" LD=\"$(tc-getCXX)\" LINK=\"$(tc-getCXX)\":g" \ 238 sed -e "s:\(\$MAKE\):\1 CC='$(tc-getCC)' CXX='$(tc-getCXX)' LINK='$(tc-getCXX)':g" \
242 -i || die "sed test compilers failed" 239 -i || die "sed test compilers failed"
243 fi
244 240
245 # Bug 172219 241 # Bug 172219
246 sed -e "s:X11R6/::" \ 242 sed -e "s:X11R6/::" -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
247 -i "${S}"/mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed ${S}/mkspecs/$(qt_mkspecs_dir)/qmake.conf failed"
248 243
249 if [[ ${CHOST} == *-darwin* ]]; then 244 if [[ ${CHOST} == *-darwin* ]]; then
250 # Set FLAGS *and* remove -arch, since our gcc-apple is multilib 245 # Set FLAGS *and* remove -arch, since our gcc-apple is multilib
251 # crippled (by design) :/ 246 # crippled (by design) :/
252 sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ 247 sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
266 -e "s:-arch \$i::" \ 261 -e "s:-arch \$i::" \
267 -e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \ 262 -e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \
268 -e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \ 263 -e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \
269 -e "s:-Xarch_x86_64::g" \ 264 -e "s:-Xarch_x86_64::g" \
270 -e "s:-Xarch_ppc64::g" \ 265 -e "s:-Xarch_ppc64::g" \
271 -i configure mkspecs/common/mac-g++.conf || die "sed configure failed" 266 -i configure mkspecs/common/mac-g++.conf || die "sed -arch/-Xarch failed"
272 267
273 # On Snow Leopard don't fall back to 10.5 deployment target. 268 # On Snow Leopard don't fall back to 10.5 deployment target.
274 if [[ ${CHOST} == *-apple-darwin10 ]] ; then 269 if [[ ${CHOST} == *-apple-darwin10 ]] ; then
275 sed -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \ 270 sed -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \
276 -e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \ 271 -e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \
277 -i configure mkspecs/common/mac-g++.conf || die "sed configure failed" 272 -i configure mkspecs/common/mac-g++.conf || die "sed deployment target failed"
278 fi 273 fi
279 fi 274 fi
280 275
281 # this one is needed for all systems with a separate -liconv, apart from 276 # this one is needed for all systems with a separate -liconv, apart from
282 # Darwin, for which the sources already cater for -liconv 277 # Darwin, for which the sources already cater for -liconv
312 # this one is needed for all systems with a separate -liconv, apart from 307 # this one is needed for all systems with a separate -liconv, apart from
313 # Darwin, for which the sources already cater for -liconv 308 # Darwin, for which the sources already cater for -liconv
314 use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \ 309 use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \
315 myconf+=" -liconv" 310 myconf+=" -liconv"
316 311
317 if has glib ${IUSE//+} && use glib; then 312 if use_if_iuse glib; then
318 # use -I, -L and -l from configure 313 # use -I, -L and -l from configure
319 local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)" 314 local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)"
320 # avoid the -pthread argument 315 # avoid the -pthread argument
321 myconf+=" ${glibflags//-pthread}" 316 myconf+=" ${glibflags//-pthread}"
322 unset glibflags 317 unset glibflags
318 fi
319
320 if use_if_iuse qpa; then
321 ewarn
322 ewarn "The qpa useflag enables the Qt Platform Abstraction, formely"
323 ewarn "known as Qt Lighthouse. If you are not sure what that is, then"
324 ewarn "disable it before reporting any bugs related to this useflag."
325 ewarn
326 myconf+=" -qpa"
323 fi 327 fi
324 328
325 if use aqua ; then 329 if use aqua ; then
326 # On (snow) leopard use the new (frameworked) cocoa code. 330 # On (snow) leopard use the new (frameworked) cocoa code.
327 if [[ ${CHOST##*-darwin} -ge 9 ]] ; then 331 if [[ ${CHOST##*-darwin} -ge 9 ]] ; then
343 # freetype2 include dir is non-standard, thus include it on configure 347 # freetype2 include dir is non-standard, thus include it on configure
344 # use -I from configure 348 # use -I from configure
345 myconf+=" $(pkg-config --cflags freetype2)" 349 myconf+=" $(pkg-config --cflags freetype2)"
346 fi 350 fi
347 351
348 # Disable SSE4.x, since auto-detection is currently broken
349 # Upstream bug http://bugreports.qt.nokia.com/browse/QTBUG-13623
350 [[ ${PV} == "4.7.1" ]] && myconf+=" -no-sse4.1 -no-sse4.2"
351
352 echo ./configure ${myconf} 352 echo ./configure ${myconf}
353 ./configure ${myconf} || die "./configure failed" 353 ./configure ${myconf} || die "./configure failed"
354 myconf="" 354 myconf=""
355 355
356 prepare_directories ${QT4_TARGET_DIRECTORIES} 356 prepare_directories ${QT4_TARGET_DIRECTORIES}
357} 357}
358 358
359# @FUNCTION: qt4-build_src_compile 359# @FUNCTION: qt4-build_src_compile
360# @DESCRIPTION:
360# @DESCRIPTION: Actual compile phase 361# Actual compile phase
361qt4-build_src_compile() { 362qt4-build_src_compile() {
362 setqtenv 363 setqtenv
363 364
364 build_directories ${QT4_TARGET_DIRECTORIES} 365 build_directories ${QT4_TARGET_DIRECTORIES}
365} 366}
373 done 374 done
374} 375}
375 376
376# @FUNCTION: fix_includes 377# @FUNCTION: fix_includes
377# @DESCRIPTION: 378# @DESCRIPTION:
378# For MacOSX we need to add some symlinks when frameworks are 379# For MacOS X we need to add some symlinks when frameworks are
379# being used, to avoid complications with some more or less stupid packages. 380# being used, to avoid complications with some more or less stupid packages.
380fix_includes() { 381fix_includes() {
381 if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then 382 if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
382 # Some packages tend to include <Qt/...> 383 # Some packages tend to include <Qt/...>
383 dodir "${QTHEADERDIR#${EPREFIX}}"/Qt 384 dodir "${QTHEADERDIR#${EPREFIX}}"/Qt
403# @DESCRIPTION: 404# @DESCRIPTION:
404# Perform the actual installation including some library fixes. 405# Perform the actual installation including some library fixes.
405qt4-build_src_install() { 406qt4-build_src_install() {
406 [[ ${EAPI} == 2 ]] && use !prefix && ED=${D} 407 [[ ${EAPI} == 2 ]] && use !prefix && ED=${D}
407 setqtenv 408 setqtenv
409
408 install_directories ${QT4_TARGET_DIRECTORIES} 410 install_directories ${QT4_TARGET_DIRECTORIES}
409 install_qconfigs 411 install_qconfigs
410 fix_library_files 412 fix_library_files
411 fix_includes 413 fix_includes
414
412 # remove .la files since we are building only shared Qt libraries 415 # remove .la files since we are building only shared Qt libraries
413 find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm 416 find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm
414} 417}
415 418
416# @FUNCTION: setqtenv 419# @FUNCTION: setqtenv
417setqtenv() { 420setqtenv() {
418 # Set up installation directories 421 # Set up installation directories
419 QTBASEDIR=${EPREFIX}/usr/$(get_libdir)/qt4
420 QTPREFIXDIR=${EPREFIX}/usr 422 QTPREFIXDIR=${EPREFIX}/usr
421 QTBINDIR=${EPREFIX}/usr/bin 423 QTBINDIR=${EPREFIX}/usr/bin
422 QTLIBDIR=${EPREFIX}/usr/$(get_libdir)/qt4 424 QTLIBDIR=${EPREFIX}/usr/$(get_libdir)/qt4
423 QMAKE_LIBDIR_QT=${QTLIBDIR}
424 QTPCDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig 425 QTPCDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig
425 QTDATADIR=${EPREFIX}/usr/share/qt4
426 QTDOCDIR=${EPREFIX}/usr/share/doc/qt-${PV} 426 QTDOCDIR=${EPREFIX}/usr/share/doc/qt-${PV}
427 QTHEADERDIR=${EPREFIX}/usr/include/qt4 427 QTHEADERDIR=${EPREFIX}/usr/include/qt4
428 QTPLUGINDIR=${QTLIBDIR}/plugins 428 QTPLUGINDIR=${QTLIBDIR}/plugins
429 QTIMPORTDIR=${QTLIBDIR}/imports
430 QTDATADIR=${EPREFIX}/usr/share/qt4
431 QTTRANSDIR=${QTDATADIR}/translations
429 QTSYSCONFDIR=${EPREFIX}/etc/qt4 432 QTSYSCONFDIR=${EPREFIX}/etc/qt4
430 QTTRANSDIR=${QTDATADIR}/translations
431 QTEXAMPLESDIR=${QTDATADIR}/examples 433 QTEXAMPLESDIR=${QTDATADIR}/examples
432 QTDEMOSDIR=${QTDATADIR}/demos 434 QTDEMOSDIR=${QTDATADIR}/demos
435 QMAKE_LIBDIR_QT=${QTLIBDIR}
433 QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4 436 QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4
437
434 PLATFORM=$(qt_mkspecs_dir) 438 PLATFORM=$(qt_mkspecs_dir)
435 439
436 unset QMAKESPEC 440 unset QMAKESPEC
437} 441}
438 442
439# @FUNCTION: standard_configure_options 443# @FUNCTION: standard_configure_options
440# @DESCRIPTION: 444# @DESCRIPTION:
441# Sets up some standard configure options, like libdir (if necessary), whether 445# Sets up some standard configure options, like libdir (if necessary), whether
442# debug info is wanted or not. 446# debug info is wanted or not.
443standard_configure_options() { 447standard_configure_options() {
444 local myconf= 448 local myconf="-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
449 -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR}
450 -importdir ${QTIMPORTDIR} -datadir ${QTDATADIR} -translationdir ${QTTRANSDIR}
451 -sysconfdir ${QTSYSCONFDIR} -examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR}
452 -opensource -confirm-license -shared -fast -largefile -stl -verbose
453 -platform $(qt_mkspecs_dir) -nomake examples -nomake demos"
445 454
446 [[ $(get_libdir) != lib ]] && myconf+=" -L${EPREFIX}/usr/$(get_libdir)" 455 [[ $(get_libdir) != lib ]] && myconf+=" -L${EPREFIX}/usr/$(get_libdir)"
447 456
448 # Disable visibility explicitly if gcc version isn't 4 457 # debug/release
449 if [[ $(gcc-major-version) -lt 4 ]]; then
450 myconf+=" -no-reduce-exports"
451 fi
452
453 # precompiled headers doesn't work on hardened, where the flag is masked.
454 myconf+=" $(qt_use pch)"
455
456 if use debug; then 458 if use debug; then
457 myconf+=" -debug" 459 myconf+=" -debug"
458 else 460 else
459 myconf+=" -release" 461 myconf+=" -release"
460 fi 462 fi
461 myconf+=" -no-separate-debug-info" 463 myconf+=" -no-separate-debug-info"
462 464
465 # exceptions USE flag
466 local exceptions="-exceptions"
467 in_iuse exceptions && exceptions="$(qt_use exceptions)"
468 myconf+=" ${exceptions}"
469
470 # disable RPATH on Qt >= 4.8 (bug 380415)
471 version_is_at_least 4.8 && myconf+=" -no-rpath"
472
473 # precompiled headers don't work on hardened, where the flag is masked
474 myconf+=" $(qt_use pch)"
475
476 # -reduce-relocations
477 # This flag seems to introduce major breakage to applications,
478 # mostly to be seen as a core dump with the message "QPixmap: Must
479 # construct a QApplication before a QPaintDevice" on Solaris.
480 # -- Daniel Vergien
481 [[ ${CHOST} != *-solaris* ]] && myconf+=" -reduce-relocations"
482
463 use aqua && myconf+=" -no-framework" 483 use aqua && myconf+=" -no-framework"
464 484
465 # ARCH is set on Gentoo. Qt now falls back to generic on an unsupported 485 # ARCH is set on Gentoo. Qt now falls back to generic on an unsupported
466 # $(tc-arch). Therefore we convert it to supported values. 486 # $(tc-arch). Therefore we convert it to supported values.
467 case "$(tc-arch)" in 487 case "$(tc-arch)" in
468 amd64|x64-*) myconf+=" -arch x86_64" ;; 488 amd64|x64-*) myconf+=" -arch x86_64" ;;
469 ppc-macos) myconf+=" -arch ppc" ;; 489 ppc-macos) myconf+=" -arch ppc" ;;
470 ppc|ppc64|ppc-*) myconf+=" -arch powerpc" ;; 490 ppc|ppc64|ppc-*) myconf+=" -arch powerpc" ;;
471 sparc|sparc-*) myconf+=" -arch sparc" ;; 491 sparc|sparc-*|sparc64-*) myconf+=" -arch sparc" ;;
472 x86-macos) myconf+=" -arch x86" ;; 492 x86-macos) myconf+=" -arch x86" ;;
473 x86|x86-*) myconf+=" -arch i386" ;; 493 x86|x86-*) myconf+=" -arch i386" ;;
474 alpha|arm|ia64|mips|s390|sparc) myconf+=" -arch $(tc-arch)" ;; 494 alpha|arm|ia64|mips|s390) myconf+=" -arch $(tc-arch)" ;;
475 hppa|sh) myconf+=" -arch generic" ;; 495 hppa|sh) myconf+=" -arch generic" ;;
476 *) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;; 496 *) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
477 esac 497 esac
478 498
479 # 4.5: build everything but qt-xmlpatterns w/o exceptions
480 # 4.6: exceptions USE flag
481 local exceptions="-exceptions"
482 case "${PV}" in
483 4.5.*)
484 [[ ${PN} == "qt-xmlpatterns" ]] || exceptions="-no-exceptions"
485 ;;
486 *)
487 has exceptions "${IUSE//+}" && exceptions="$(qt_use exceptions)"
488 ;;
489 esac
490
491 # note about -reduce-relocations:
492 # That flag seems to introduce major breakage to applications,
493 # mostly to be seen as a core dump with the message "QPixmap: Must
494 # construct a QApplication before a QPaintDevice" on Solaris
495 # -- Daniel Vergien
496 [[ ${CHOST} != *-solaris* ]] && myconf+=" -reduce-relocations"
497
498 myconf+=" -platform $(qt_mkspecs_dir) -stl -verbose -largefile -confirm-license
499 -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
500 -datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR}
501 -plugindir ${QTPLUGINDIR} -sysconfdir ${QTSYSCONFDIR}
502 -translationdir ${QTTRANSDIR} -examplesdir ${QTEXAMPLESDIR}
503 -demosdir ${QTDEMOSDIR} -silent -fast -opensource
504 ${exceptions}
505 -nomake examples -nomake demos"
506
507 echo "${myconf}" 499 echo "${myconf}"
508} 500}
509 501
510# @FUNCTION: prepare_directories 502# @FUNCTION: prepare_directories
511# @USAGE: < directories > 503# @USAGE: < directories >
512# @DESCRIPTION: 504# @DESCRIPTION:
513# Generates makefiles for the directories set in $QT4_TARGET_DIRECTORIES 505# Generates Makefiles for the given list of directories.
514prepare_directories() { 506prepare_directories() {
515 for x in "$@"; do 507 for x in "$@"; do
516 pushd "${S}"/${x} >/dev/null 508 pushd "${S}"/${x} >/dev/null || die
517 einfo "running qmake in: $x" 509 einfo "Running qmake in: ${x}"
518 # avoid running over the maximum argument number, bug #299810 510 # avoid running over the maximum argument number, bug #299810
519 { 511 {
520 echo "${S}"/mkspecs/common/*.conf 512 echo "${S}"/mkspecs/common/*.conf
521 find "${S}" -name '*.pr[io]' 513 find "${S}" -name '*.pr[io]'
522 } | xargs sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:${EPREFIX}/usr/$(get_libdir)/qt4:g" || die 514 } | xargs sed -i \
515 -e "s:\$\$\[QT_INSTALL_LIBS\]:${QTLIBDIR}:g" \
516 -e "s:\$\$\[QT_INSTALL_PLUGINS\]:${QTPLUGINDIR}:g" \
517 || die
523 "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed" 518 "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
524 popd >/dev/null 519 popd >/dev/null || die
525 done 520 done
526} 521}
527 522
528 523
529# @FUNCTION: build_directories 524# @FUNCTION: build_directories
530# @USAGE: < directories > 525# @USAGE: < directories >
531# @DESCRIPTION: 526# @DESCRIPTION:
532# Compiles the code in $QT4_TARGET_DIRECTORIES 527# Compiles the code in the given list of directories.
533build_directories() { 528build_directories() {
534 for x in "$@"; do 529 for x in "$@"; do
535 pushd "${S}"/${x} >/dev/null 530 pushd "${S}"/${x} >/dev/null || die
536 emake CC="$(tc-getCC)" \ 531 emake CC="$(tc-getCC)" \
537 CXX="$(tc-getCXX)" \ 532 CXX="$(tc-getCXX)" \
538 LINK="$(tc-getCXX)" || die "emake failed" 533 LINK="$(tc-getCXX)" || die "emake failed"
539 popd >/dev/null 534 popd >/dev/null || die
540 done 535 done
541} 536}
542 537
543# @FUNCTION: install_directories 538# @FUNCTION: install_directories
544# @USAGE: < directories > 539# @USAGE: < directories >
545# @DESCRIPTION: 540# @DESCRIPTION:
546# run emake install in the given directories, which are separated by spaces 541# Runs emake install in the given directories, which are separated by spaces.
547install_directories() { 542install_directories() {
548 for x in "$@"; do 543 for x in "$@"; do
549 pushd "${S}"/${x} >/dev/null || die "Can't pushd ${S}/${x}" 544 pushd "${S}"/${x} >/dev/null || die
550 emake INSTALL_ROOT="${D}" install || die "emake install failed" 545 emake INSTALL_ROOT="${D}" install || die "emake install failed"
551 popd >/dev/null || die "Can't popd from ${S}/${x}" 546 popd >/dev/null || die
552 done 547 done
553} 548}
554 549
555# @ECLASS-VARIABLE: QCONFIG_ADD 550# @ECLASS-VARIABLE: QCONFIG_ADD
556# @DESCRIPTION: 551# @DESCRIPTION:
566# @DESCRIPTION: 561# @DESCRIPTION:
567# List variables that should be defined at the top of QtCore/qconfig.h 562# List variables that should be defined at the top of QtCore/qconfig.h
568: ${QCONFIG_DEFINE:=} 563: ${QCONFIG_DEFINE:=}
569 564
570# @FUNCTION: install_qconfigs 565# @FUNCTION: install_qconfigs
566# @DESCRIPTION:
571# @DESCRIPTION: Install gentoo-specific mkspecs configurations 567# Install gentoo-specific mkspecs configurations.
572install_qconfigs() { 568install_qconfigs() {
573 local x 569 local x
574 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then 570 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
575 for x in QCONFIG_ADD QCONFIG_REMOVE; do 571 for x in QCONFIG_ADD QCONFIG_REMOVE; do
576 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri 572 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
587 doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed" 583 doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed"
588 fi 584 fi
589} 585}
590 586
591# @FUNCTION: generate_qconfigs 587# @FUNCTION: generate_qconfigs
592# @DESCRIPTION: Generates gentoo-specific configurations 588# @DESCRIPTION:
589# Generates gentoo-specific qconfig.{h,pri}.
593generate_qconfigs() { 590generate_qconfigs() {
594 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then 591 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then
595 local x qconfig_add qconfig_remove qconfig_new 592 local x qconfig_add qconfig_remove qconfig_new
596 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do 593 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
597 [[ -f ${x} ]] || continue 594 [[ -f ${x} ]] || continue
645 fi 642 fi
646 fi 643 fi
647} 644}
648 645
649# @FUNCTION: qt4-build_pkg_postrm 646# @FUNCTION: qt4-build_pkg_postrm
647# @DESCRIPTION:
650# @DESCRIPTION: Generate configurations when the package is completely removed 648# Regenerate configuration when the package is completely removed.
651qt4-build_pkg_postrm() { 649qt4-build_pkg_postrm() {
652 generate_qconfigs 650 generate_qconfigs
653} 651}
654 652
655# @FUNCTION: qt4-build_pkg_postinst 653# @FUNCTION: qt4-build_pkg_postinst
654# @DESCRIPTION:
656# @DESCRIPTION: Generate configuration, plus throws a message about possible 655# Regenerate configuration, plus throw a message about possible
657# breakages and proposed solutions. 656# breakages and proposed solutions.
658qt4-build_pkg_postinst() { 657qt4-build_pkg_postinst() {
659 generate_qconfigs 658 generate_qconfigs
660} 659}
661 660
662# @FUNCTION: skip_qmake_build_patch 661# @FUNCTION: skip_qmake_build
663# @DESCRIPTION: 662# @DESCRIPTION:
664# Don't need to build qmake, as it's already installed from qt-core 663# Patches configure to skip qmake compilation, as it's already installed by qt-core.
665skip_qmake_build_patch() { 664skip_qmake_build() {
666 # Don't need to build qmake, as it's already installed from qt-core
667 sed -i -e "s:if true:if false:g" "${S}"/configure || die "Sed failed" 665 sed -i -e "s:if true:if false:g" "${S}"/configure || die
668} 666}
669 667
670# @FUNCTION: skip_project_generation_patch 668# @FUNCTION: skip_project_generation
671# @DESCRIPTION: 669# @DESCRIPTION:
672# Exit the script early by throwing in an exit before all of the .pro files are scanned 670# Exit the script early by throwing in an exit before all of the .pro files are scanned.
673skip_project_generation_patch() { 671skip_project_generation() {
674 # Exit the script early by throwing in an exit before all of the .pro files are scanned
675 sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \ 672 sed -i -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" "${S}"/configure || die
676 -i "${S}"/configure || die "Sed failed"
677} 673}
678 674
679# @FUNCTION: symlink_binaries_to_buildtree 675# @FUNCTION: symlink_binaries_to_buildtree
680# @DESCRIPTION: 676# @DESCRIPTION:
681# Symlink generated binaries to buildtree so they can be used during compilation 677# Symlinks generated binaries to buildtree, so they can be used during compilation time.
682# time
683symlink_binaries_to_buildtree() { 678symlink_binaries_to_buildtree() {
684 for bin in qmake moc uic rcc; do 679 for bin in qmake moc uic rcc; do
685 ln -s ${QTBINDIR}/${bin} "${S}"/bin/ || die "Symlinking ${bin} to ${S}/bin failed." 680 ln -s "${QTBINDIR}"/${bin} "${S}"/bin/ || die "symlinking ${bin} to ${S}/bin failed"
686 done 681 done
687} 682}
688 683
689# @FUNCTION: fix_library_files 684# @FUNCTION: fix_library_files
690# @DESCRIPTION: 685# @DESCRIPTION:
691# Fixes the pathes in *.la, *.prl, *.pc, as they are wrong due to sandbox and 686# Fixes the paths in *.la, *.prl, *.pc, as they are wrong due to sandbox and
692# moves the *.pc-files into the pkgconfig directory 687# moves the *.pc files into the pkgconfig directory.
693fix_library_files() { 688fix_library_files() {
689 local libfile
694 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do 690 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do
695 if [[ -e ${libfile} ]]; then 691 if [[ -e ${libfile} ]]; then
696 sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "Sed on ${libfile} failed." 692 sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "sed on ${libfile} failed"
697 fi 693 fi
698 done 694 done
699 695
700 # pkgconfig files refer to WORKDIR/bin as the moc and uic locations. Fix: 696 # pkgconfig files refer to WORKDIR/bin as the moc and uic locations
701 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do 697 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do
702 if [[ -e ${libfile} ]]; then 698 if [[ -e ${libfile} ]]; then
703 sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "Sed failed" 699 sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "sed on ${libfile} failed"
704 700
705 # Move .pc files into the pkgconfig directory 701 # Move .pc files into the pkgconfig directory
706 dodir ${QTPCDIR#${EPREFIX}} 702 dodir ${QTPCDIR#${EPREFIX}}
707 mv ${libfile} "${D}"/${QTPCDIR}/ \ 703 mv ${libfile} "${D}"/${QTPCDIR}/ || die "moving ${libfile} to ${D}/${QTPCDIR}/ failed"
708 || die "Moving ${libfile} to ${D}/${QTPCDIR}/ failed."
709 fi 704 fi
710 done 705 done
711 706
712 # Don't install an empty directory 707 # Don't install an empty directory
713 rmdir "${D}"/${QTLIBDIR}/pkgconfig 708 rmdir "${D}"/${QTLIBDIR}/pkgconfig
717# @USAGE: < flag > [ feature ] [ enableval ] 712# @USAGE: < flag > [ feature ] [ enableval ]
718# @DESCRIPTION: 713# @DESCRIPTION:
719# This will echo "${enableval}-${feature}" if <flag> is enabled, or 714# This will echo "${enableval}-${feature}" if <flag> is enabled, or
720# "-no-${feature} if the flag is disabled. If [feature] is not specified <flag> 715# "-no-${feature} if the flag is disabled. If [feature] is not specified <flag>
721# will be used for that. If [enableval] is not specified, it omits the 716# will be used for that. If [enableval] is not specified, it omits the
722# assignment-part 717# assignment part.
723qt_use() { 718qt_use() {
724 local flag=$1 719 local flag=$1
725 local feature=$1 720 local feature=$1
726 local enableval= 721 local enableval=
727 722
738# @FUNCTION: qt_mkspecs_dir 733# @FUNCTION: qt_mkspecs_dir
739# @RETURN: the specs-directory w/o path 734# @RETURN: the specs-directory w/o path
740# @DESCRIPTION: 735# @DESCRIPTION:
741# Allows us to define which mkspecs dir we want to use. 736# Allows us to define which mkspecs dir we want to use.
742qt_mkspecs_dir() { 737qt_mkspecs_dir() {
743 # Allows us to define which mkspecs dir we want to use.
744 local spec 738 local spec=
745
746 case ${CHOST} in 739 case ${CHOST} in
747 *-freebsd*|*-dragonfly*) 740 *-freebsd*|*-dragonfly*)
748 spec=freebsd ;; 741 spec=freebsd ;;
749 *-openbsd*) 742 *-openbsd*)
750 spec=openbsd ;; 743 spec=openbsd ;;
762 *-solaris*) 755 *-solaris*)
763 spec=solaris ;; 756 spec=solaris ;;
764 *-linux-*|*-linux) 757 *-linux-*|*-linux)
765 spec=linux ;; 758 spec=linux ;;
766 *) 759 *)
767 die "Unknown CHOST, no platform choosen." 760 die "Unknown CHOST, no platform chosen"
768 esac 761 esac
769 762
770 CXX=$(tc-getCXX) 763 CXX=$(tc-getCXX)
771 if [[ ${CXX} == *g++* ]]; then 764 if [[ ${CXX} == *g++* ]]; then
772 spec+=-g++ 765 spec+=-g++
773 elif [[ ${CXX} == *icpc* ]]; then 766 elif [[ ${CXX} == *icpc* ]]; then
774 spec+=-icc 767 spec+=-icc
775 else 768 else
776 die "Unknown compiler ${CXX}." 769 die "Unknown compiler '${CXX}'"
777 fi 770 fi
778 if [[ -n ${LIBDIR/lib} ]]; then 771 if [[ -n ${LIBDIR/lib} ]]; then
779 spec+=-${LIBDIR/lib} 772 spec+=-${LIBDIR/lib}
780 fi 773 fi
781 774
791 784
792 echo "${spec}" 785 echo "${spec}"
793} 786}
794 787
795# @FUNCTION: qt_assistant_cleanup 788# @FUNCTION: qt_assistant_cleanup
796# @RETURN: nothing
797# @DESCRIPTION: 789# @DESCRIPTION:
798# Tries to clean up tools.pro for qt-assistant ebuilds 790# Tries to clean up tools.pro for qt-assistant ebuilds.
799# Meant to be called in src_prepare 791# Meant to be called in src_prepare().
792# Since Qt 4.7.4 this function is a no-op.
800qt_assistant_cleanup() { 793qt_assistant_cleanup() {
794 # apply patching to qt-assistant ebuilds only
795 [[ ${PN} != "qt-assistant" ]] && return
796
797 # no longer needed for 4.7.4 and later
798 version_is_at_least "4.7.4" && return
799
801 # different versions (and branches...) may need different handling, 800 # different versions (and branches...) may need different handling,
802 # add a case if you need special handling 801 # add a case if you need special handling
803 case "${MY_PV_EXTRA}" in 802 case "${MY_PV_EXTRA}" in
804 *kde-qt*) 803 *kde-qt*)
805 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \ 804 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \
814 ;; 813 ;;
815 esac 814 esac
816} 815}
817 816
818# @FUNCTION: qt_nolibx11 817# @FUNCTION: qt_nolibx11
819# @RETURN: nothing
820# @DESCRIPTION: 818# @DESCRIPTION:
821# Ignore X11 tests for packages that don't need X libraries installed 819# Ignore X11 tests for packages that don't need X libraries installed.
822qt_nolibx11() { 820qt_nolibx11() {
823 einfo "removing X11 check to allow X-less compilation"
824 sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure || 821 sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure ||
825 die "x11 check sed failed" 822 die "x11 check sed failed"
826} 823}
827 824
828EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst 825EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst

Legend:
Removed from v.1.92  
changed lines
  Added in v.1.109

  ViewVC Help
Powered by ViewVC 1.1.20