/[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.93 Revision 1.111
1# Copyright 1999-2011 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.93 2011/08/22 04:46:32 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.111 2011/12/27 16:04:27 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
153# @DEFAULT_UNSET
164# @DESCRIPTION: 154# @DESCRIPTION:
165# In case you have patches to apply, specify them in PATCHES variable. Make sure 155# PATCHES array variable containing all various patches to be applied.
166# to specify the full path. This variable is necessary for src_prepare phase. 156# This variable is expected to be defined in global scope of ebuild.
167# example: 157# Make sure to specify the full path. This variable is utilised in
168# PATCHES="${FILESDIR}"/mypatch.patch 158# src_unpack/src_prepare phase, based on EAPI.
169# ${FILESDIR}"/mypatch2.patch"
170# 159#
160# @CODE
161# PATCHES=( "${FILESDIR}/mypatch.patch"
162# "${FILESDIR}/patches_folder/" )
163# @CODE
171 164
172# @FUNCTION: qt4-build_src_prepare 165# @FUNCTION: qt4-build_src_prepare
173# @DESCRIPTION: 166# @DESCRIPTION:
174# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix 167# 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. 168# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in /etc/make.conf.
176qt4-build_src_prepare() { 169qt4-build_src_prepare() {
177 setqtenv 170 setqtenv
178 cd "${S}" 171 cd "${S}"
179 172
180 # fix qt 4.7 regression that skips -fvisibility=hidden
181 if version_is_at_least "4.7.0_beta1"; then 173 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 174 # 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" 175 local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"
189 has ${PN} ${NOLIBX11PKG} && qt_nolibx11 176 has ${PN} ${nolibx11_pkgs} && qt_nolibx11
190 [[ ${PN} == "qt-assistant" ]] && qt_assistant_cleanup 177
178 qt_assistant_cleanup
191 fi 179 fi
192 180
193 if use aqua; then 181 if use aqua; then
194 # provide a proper macx-g++-64 182 # provide a proper macx-g++-64
195 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir) 183 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir)
196 184
197 sed -e '/^CONFIG/s:app_bundle::' \ 185 sed -e '/^CONFIG/s:app_bundle::' \
198 -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \ 186 -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \
199 -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed failed" 187 -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
200 fi 188 fi
201 189
202 if [[ ${PN} != qt-core ]]; then 190 if [[ ${PN} != qt-core ]]; then
203 skip_qmake_build_patch 191 skip_qmake_build
204 skip_project_generation_patch 192 skip_project_generation
205 symlink_binaries_to_buildtree 193 symlink_binaries_to_buildtree
206 fi 194 fi
207 195
208 if [[ ${CHOST} == *86*-apple-darwin* ]] ; then 196 if [[ ${CHOST} == *86*-apple-darwin* ]] ; then
209 # qmake bus errors with -O2 but -O3 works 197 # qmake bus errors with -O2 but -O3 works
… …
212 200
213 # Bug 178652 201 # Bug 178652
214 if [[ $(gcc-major-version) == 3 ]] && use amd64; then 202 if [[ $(gcc-major-version) == 3 ]] && use amd64; then
215 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS" 203 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
216 append-flags -fno-gcse 204 append-flags -fno-gcse
205 fi
206
207 if use_if_iuse c++0x; then
208 ewarn "You are about to build Qt4 using the C++11 standard. Even though"
209 ewarn "this is an official standard, some of the reverse dependencies"
210 ewarn "may fail to compile or link againt the Qt4 libraries. Before"
211 ewarn "reporting a bug, make sure your bug is reproducible with c++0x"
212 ewarn "disabled."
213 append-flags -std=c++0x
217 fi 214 fi
218 215
219 # Unsupported old gcc versions - hardened needs this :( 216 # Unsupported old gcc versions - hardened needs this :(
220 if [[ $(gcc-major-version) -lt 4 ]] ; then 217 if [[ $(gcc-major-version) -lt 4 ]] ; then
221 ewarn "Appending -fno-stack-protector to CXXFLAGS" 218 ewarn "Appending -fno-stack-protector to CXXFLAGS"
222 append-cxxflags -fno-stack-protector 219 append-cxxflags -fno-stack-protector
223 # Bug 253127 220 # Bug 253127
224 sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \ 221 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" 222 -i mkspecs/common/g++.conf || die
226 fi 223 fi
227 224
228 # Bug 261632 225 # Bug 261632
229 if use ppc64; then 226 if use ppc64; then
230 ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS" 227 ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS"
231 append-flags -mminimal-toc 228 append-flags -mminimal-toc
232 fi 229 fi
233 230
234 # Bug 282984 && Bug 295530 231 # 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:" \ 232 sed -e "/^SYSTEM_VARIABLES=/i \
236 -i configure || die "sed qmake compilers failed" 233 CC='$(tc-getCC)'\n\
234 CXX='$(tc-getCXX)'\n\
235 CFLAGS='${CFLAGS}'\n\
236 CXXFLAGS='${CXXFLAGS}'\n\
237 LDFLAGS='${LDFLAGS}'\n" \
238 -i configure || die "sed SYSTEM_VARIABLES failed"
239
237 # bug 321335 240 # Bug 321335
238 if version_is_at_least 4.6; then
239 find ./config.tests/unix -name "*.test" -type f -exec grep -lZ \$MAKE '{}' \; | \ 241 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" \ 242 sed -e "s:\(\$MAKE\):\1 CC='$(tc-getCC)' CXX='$(tc-getCXX)' LINK='$(tc-getCXX)':g" \
242 -i || die "sed test compilers failed" 243 -i || die "sed test compilers failed"
243 fi
244 244
245 # Bug 172219 245 # Bug 172219
246 sed -e "s:X11R6/::" \ 246 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 247
249 if [[ ${CHOST} == *-darwin* ]]; then 248 if [[ ${CHOST} == *-darwin* ]]; then
250 # Set FLAGS *and* remove -arch, since our gcc-apple is multilib 249 # Set FLAGS *and* remove -arch, since our gcc-apple is multilib
251 # crippled (by design) :/ 250 # crippled (by design) :/
252 sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ 251 sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
… …
266 -e "s:-arch \$i::" \ 265 -e "s:-arch \$i::" \
267 -e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \ 266 -e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \
268 -e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \ 267 -e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \
269 -e "s:-Xarch_x86_64::g" \ 268 -e "s:-Xarch_x86_64::g" \
270 -e "s:-Xarch_ppc64::g" \ 269 -e "s:-Xarch_ppc64::g" \
271 -i configure mkspecs/common/mac-g++.conf || die "sed configure failed" 270 -i configure mkspecs/common/mac-g++.conf || die "sed -arch/-Xarch failed"
272 271
273 # On Snow Leopard don't fall back to 10.5 deployment target. 272 # On Snow Leopard don't fall back to 10.5 deployment target.
274 if [[ ${CHOST} == *-apple-darwin10 ]] ; then 273 if [[ ${CHOST} == *-apple-darwin10 ]] ; then
275 sed -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \ 274 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" \ 275 -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" 276 -i configure mkspecs/common/mac-g++.conf || die "sed deployment target failed"
278 fi 277 fi
279 fi 278 fi
280 279
281 # this one is needed for all systems with a separate -liconv, apart from 280 # this one is needed for all systems with a separate -liconv, apart from
282 # Darwin, for which the sources already cater for -liconv 281 # Darwin, for which the sources already cater for -liconv
… …
312 # this one is needed for all systems with a separate -liconv, apart from 311 # this one is needed for all systems with a separate -liconv, apart from
313 # Darwin, for which the sources already cater for -liconv 312 # Darwin, for which the sources already cater for -liconv
314 use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \ 313 use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \
315 myconf+=" -liconv" 314 myconf+=" -liconv"
316 315
317 if has glib ${IUSE//+} && use glib; then 316 if use_if_iuse glib; then
318 # use -I, -L and -l from configure 317 # use -I, -L and -l from configure
319 local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)" 318 local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)"
320 # avoid the -pthread argument 319 # avoid the -pthread argument
321 myconf+=" ${glibflags//-pthread}" 320 myconf+=" ${glibflags//-pthread}"
322 unset glibflags 321 unset glibflags
322 fi
323
324 if use_if_iuse qpa; then
325 ewarn
326 ewarn "The qpa useflag enables the Qt Platform Abstraction, formely"
327 ewarn "known as Qt Lighthouse. If you are not sure what that is, then"
328 ewarn "disable it before reporting any bugs related to this useflag."
329 ewarn
330 myconf+=" -qpa"
323 fi 331 fi
324 332
325 if use aqua ; then 333 if use aqua ; then
326 # On (snow) leopard use the new (frameworked) cocoa code. 334 # On (snow) leopard use the new (frameworked) cocoa code.
327 if [[ ${CHOST##*-darwin} -ge 9 ]] ; then 335 if [[ ${CHOST##*-darwin} -ge 9 ]] ; then
… …
343 # freetype2 include dir is non-standard, thus include it on configure 351 # freetype2 include dir is non-standard, thus include it on configure
344 # use -I from configure 352 # use -I from configure
345 myconf+=" $(pkg-config --cflags freetype2)" 353 myconf+=" $(pkg-config --cflags freetype2)"
346 fi 354 fi
347 355
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} 356 echo ./configure ${myconf}
353 ./configure ${myconf} || die "./configure failed" 357 ./configure ${myconf} || die "./configure failed"
354 myconf="" 358 myconf=""
355 359
356 prepare_directories ${QT4_TARGET_DIRECTORIES} 360 prepare_directories ${QT4_TARGET_DIRECTORIES}
… …
374 done 378 done
375} 379}
376 380
377# @FUNCTION: fix_includes 381# @FUNCTION: fix_includes
378# @DESCRIPTION: 382# @DESCRIPTION:
379# For MacOSX we need to add some symlinks when frameworks are 383# For MacOS X we need to add some symlinks when frameworks are
380# being used, to avoid complications with some more or less stupid packages. 384# being used, to avoid complications with some more or less stupid packages.
381fix_includes() { 385fix_includes() {
382 if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then 386 if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
383 # Some packages tend to include <Qt/...> 387 # Some packages tend to include <Qt/...>
384 dodir "${QTHEADERDIR#${EPREFIX}}"/Qt 388 dodir "${QTHEADERDIR#${EPREFIX}}"/Qt
… …
404# @DESCRIPTION: 408# @DESCRIPTION:
405# Perform the actual installation including some library fixes. 409# Perform the actual installation including some library fixes.
406qt4-build_src_install() { 410qt4-build_src_install() {
407 [[ ${EAPI} == 2 ]] && use !prefix && ED=${D} 411 [[ ${EAPI} == 2 ]] && use !prefix && ED=${D}
408 setqtenv 412 setqtenv
413
409 install_directories ${QT4_TARGET_DIRECTORIES} 414 install_directories ${QT4_TARGET_DIRECTORIES}
410 install_qconfigs 415 install_qconfigs
411 fix_library_files 416 fix_library_files
412 fix_includes 417 fix_includes
418
413 # remove .la files since we are building only shared Qt libraries 419 # remove .la files since we are building only shared Qt libraries
414 find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm 420 find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm
415} 421}
416 422
417# @FUNCTION: setqtenv 423# @FUNCTION: setqtenv
424# @INTERNAL
418setqtenv() { 425setqtenv() {
419 # Set up installation directories 426 # Set up installation directories
420 QTBASEDIR=${EPREFIX}/usr/$(get_libdir)/qt4
421 QTPREFIXDIR=${EPREFIX}/usr 427 QTPREFIXDIR=${EPREFIX}/usr
422 QTBINDIR=${EPREFIX}/usr/bin 428 QTBINDIR=${EPREFIX}/usr/bin
423 QTLIBDIR=${EPREFIX}/usr/$(get_libdir)/qt4 429 QTLIBDIR=${EPREFIX}/usr/$(get_libdir)/qt4
424 QMAKE_LIBDIR_QT=${QTLIBDIR}
425 QTPCDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig 430 QTPCDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig
426 QTDATADIR=${EPREFIX}/usr/share/qt4
427 QTDOCDIR=${EPREFIX}/usr/share/doc/qt-${PV} 431 QTDOCDIR=${EPREFIX}/usr/share/doc/qt-${PV}
428 QTHEADERDIR=${EPREFIX}/usr/include/qt4 432 QTHEADERDIR=${EPREFIX}/usr/include/qt4
429 QTPLUGINDIR=${QTLIBDIR}/plugins 433 QTPLUGINDIR=${QTLIBDIR}/plugins
434 QTIMPORTDIR=${QTLIBDIR}/imports
435 QTDATADIR=${EPREFIX}/usr/share/qt4
436 QTTRANSDIR=${QTDATADIR}/translations
430 QTSYSCONFDIR=${EPREFIX}/etc/qt4 437 QTSYSCONFDIR=${EPREFIX}/etc/qt4
431 QTTRANSDIR=${QTDATADIR}/translations
432 QTEXAMPLESDIR=${QTDATADIR}/examples 438 QTEXAMPLESDIR=${QTDATADIR}/examples
433 QTDEMOSDIR=${QTDATADIR}/demos 439 QTDEMOSDIR=${QTDATADIR}/demos
440 QMAKE_LIBDIR_QT=${QTLIBDIR}
434 QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4 441 QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4
442
435 PLATFORM=$(qt_mkspecs_dir) 443 PLATFORM=$(qt_mkspecs_dir)
436 444
437 unset QMAKESPEC 445 unset QMAKESPEC
438} 446}
439 447
440# @FUNCTION: standard_configure_options 448# @FUNCTION: standard_configure_options
449# @INTERNAL
441# @DESCRIPTION: 450# @DESCRIPTION:
442# Sets up some standard configure options, like libdir (if necessary), whether 451# Sets up some standard configure options, like libdir (if necessary), whether
443# debug info is wanted or not. 452# debug info is wanted or not.
444standard_configure_options() { 453standard_configure_options() {
445 local myconf= 454 local myconf="-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
455 -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR}
456 -importdir ${QTIMPORTDIR} -datadir ${QTDATADIR} -translationdir ${QTTRANSDIR}
457 -sysconfdir ${QTSYSCONFDIR} -examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR}
458 -opensource -confirm-license -shared -fast -largefile -stl -verbose
459 -platform $(qt_mkspecs_dir) -nomake examples -nomake demos"
446 460
447 [[ $(get_libdir) != lib ]] && myconf+=" -L${EPREFIX}/usr/$(get_libdir)" 461 [[ $(get_libdir) != lib ]] && myconf+=" -L${EPREFIX}/usr/$(get_libdir)"
448 462
449 # Disable visibility explicitly if gcc version isn't 4 463 # debug/release
450 if [[ $(gcc-major-version) -lt 4 ]]; then
451 myconf+=" -no-reduce-exports"
452 fi
453
454 # precompiled headers doesn't work on hardened, where the flag is masked.
455 myconf+=" $(qt_use pch)"
456
457 if use debug; then 464 if use debug; then
458 myconf+=" -debug" 465 myconf+=" -debug"
459 else 466 else
460 myconf+=" -release" 467 myconf+=" -release"
461 fi 468 fi
462 myconf+=" -no-separate-debug-info" 469 myconf+=" -no-separate-debug-info"
463 470
471 # exceptions USE flag
472 local exceptions="-exceptions"
473 in_iuse exceptions && exceptions="$(qt_use exceptions)"
474 myconf+=" ${exceptions}"
475
476 # disable RPATH on Qt >= 4.8 (bug 380415)
477 version_is_at_least 4.8 && myconf+=" -no-rpath"
478
479 # precompiled headers don't work on hardened, where the flag is masked
480 myconf+=" $(qt_use pch)"
481
482 # -reduce-relocations
483 # This flag seems to introduce major breakage to applications,
484 # mostly to be seen as a core dump with the message "QPixmap: Must
485 # construct a QApplication before a QPaintDevice" on Solaris.
486 # -- Daniel Vergien
487 [[ ${CHOST} != *-solaris* ]] && myconf+=" -reduce-relocations"
488
464 use aqua && myconf+=" -no-framework" 489 use aqua && myconf+=" -no-framework"
465 490
466 # ARCH is set on Gentoo. Qt now falls back to generic on an unsupported 491 # ARCH is set on Gentoo. Qt now falls back to generic on an unsupported
467 # $(tc-arch). Therefore we convert it to supported values. 492 # $(tc-arch). Therefore we convert it to supported values.
468 case "$(tc-arch)" in 493 case "$(tc-arch)" in
469 amd64|x64-*) myconf+=" -arch x86_64" ;; 494 amd64|x64-*) myconf+=" -arch x86_64" ;;
470 ppc-macos) myconf+=" -arch ppc" ;; 495 ppc-macos) myconf+=" -arch ppc" ;;
471 ppc|ppc64|ppc-*) myconf+=" -arch powerpc" ;; 496 ppc|ppc64|ppc-*) myconf+=" -arch powerpc" ;;
472 sparc|sparc-*) myconf+=" -arch sparc" ;; 497 sparc|sparc-*|sparc64-*) myconf+=" -arch sparc" ;;
473 x86-macos) myconf+=" -arch x86" ;; 498 x86-macos) myconf+=" -arch x86" ;;
474 x86|x86-*) myconf+=" -arch i386" ;; 499 x86|x86-*) myconf+=" -arch i386" ;;
475 alpha|arm|ia64|mips|s390|sparc) myconf+=" -arch $(tc-arch)" ;; 500 alpha|arm|ia64|mips|s390) myconf+=" -arch $(tc-arch)" ;;
476 hppa|sh) myconf+=" -arch generic" ;; 501 hppa|sh) myconf+=" -arch generic" ;;
477 *) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;; 502 *) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
478 esac 503 esac
479 504
480 # 4.5: build everything but qt-xmlpatterns w/o exceptions
481 # 4.6: exceptions USE flag
482 local exceptions="-exceptions"
483 case "${PV}" in
484 4.5.*)
485 [[ ${PN} == "qt-xmlpatterns" ]] || exceptions="-no-exceptions"
486 ;;
487 *)
488 has exceptions "${IUSE//+}" && exceptions="$(qt_use exceptions)"
489 ;;
490 esac
491
492 # note about -reduce-relocations:
493 # That flag seems to introduce major breakage to applications,
494 # mostly to be seen as a core dump with the message "QPixmap: Must
495 # construct a QApplication before a QPaintDevice" on Solaris
496 # -- Daniel Vergien
497 [[ ${CHOST} != *-solaris* ]] && myconf+=" -reduce-relocations"
498
499 myconf+=" -platform $(qt_mkspecs_dir) -stl -verbose -largefile -confirm-license
500 -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
501 -datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR}
502 -plugindir ${QTPLUGINDIR} -sysconfdir ${QTSYSCONFDIR}
503 -translationdir ${QTTRANSDIR} -examplesdir ${QTEXAMPLESDIR}
504 -demosdir ${QTDEMOSDIR} -silent -fast -opensource
505 ${exceptions}
506 -nomake examples -nomake demos"
507
508 echo "${myconf}" 505 echo "${myconf}"
509} 506}
510 507
511# @FUNCTION: prepare_directories 508# @FUNCTION: prepare_directories
512# @USAGE: < directories > 509# @USAGE: < directories >
510# @INTERNAL
513# @DESCRIPTION: 511# @DESCRIPTION:
514# Generates makefiles for the directories set in $QT4_TARGET_DIRECTORIES 512# Generates Makefiles for the given list of directories.
515prepare_directories() { 513prepare_directories() {
516 for x in "$@"; do 514 for x in "$@"; do
517 pushd "${S}"/${x} >/dev/null 515 pushd "${S}"/${x} >/dev/null || die
518 einfo "running qmake in: $x" 516 einfo "Running qmake in: ${x}"
519 # avoid running over the maximum argument number, bug #299810 517 # avoid running over the maximum argument number, bug #299810
520 { 518 {
521 echo "${S}"/mkspecs/common/*.conf 519 echo "${S}"/mkspecs/common/*.conf
522 find "${S}" -name '*.pr[io]' 520 find "${S}" -name '*.pr[io]'
523 } | xargs sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:${EPREFIX}/usr/$(get_libdir)/qt4:g" || die 521 } | xargs sed -i \
522 -e "s:\$\$\[QT_INSTALL_LIBS\]:${QTLIBDIR}:g" \
523 -e "s:\$\$\[QT_INSTALL_PLUGINS\]:${QTPLUGINDIR}:g" \
524 || die
524 "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed" 525 "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
525 popd >/dev/null 526 popd >/dev/null || die
526 done 527 done
527} 528}
528 529
529 530
530# @FUNCTION: build_directories 531# @FUNCTION: build_directories
531# @USAGE: < directories > 532# @USAGE: < directories >
533# @INTERNAL
532# @DESCRIPTION: 534# @DESCRIPTION:
533# Compiles the code in $QT4_TARGET_DIRECTORIES 535# Compiles the code in the given list of directories.
534build_directories() { 536build_directories() {
535 for x in "$@"; do 537 for x in "$@"; do
536 pushd "${S}"/${x} >/dev/null 538 pushd "${S}"/${x} >/dev/null || die
537 emake CC="$(tc-getCC)" \ 539 emake CC="$(tc-getCC)" \
538 CXX="$(tc-getCXX)" \ 540 CXX="$(tc-getCXX)" \
539 LINK="$(tc-getCXX)" || die "emake failed" 541 LINK="$(tc-getCXX)" || die "emake failed"
540 popd >/dev/null 542 popd >/dev/null || die
541 done 543 done
542} 544}
543 545
544# @FUNCTION: install_directories 546# @FUNCTION: install_directories
545# @USAGE: < directories > 547# @USAGE: < directories >
548# @INTERNAL
546# @DESCRIPTION: 549# @DESCRIPTION:
547# run emake install in the given directories, which are separated by spaces 550# Runs emake install in the given directories, which are separated by spaces.
548install_directories() { 551install_directories() {
549 for x in "$@"; do 552 for x in "$@"; do
550 pushd "${S}"/${x} >/dev/null || die "Can't pushd ${S}/${x}" 553 pushd "${S}"/${x} >/dev/null || die
551 emake INSTALL_ROOT="${D}" install || die "emake install failed" 554 emake INSTALL_ROOT="${D}" install || die "emake install failed"
552 popd >/dev/null || die "Can't popd from ${S}/${x}" 555 popd >/dev/null || die
553 done 556 done
554} 557}
555 558
556# @ECLASS-VARIABLE: QCONFIG_ADD 559# @ECLASS-VARIABLE: QCONFIG_ADD
557# @DESCRIPTION: 560# @DESCRIPTION:
… …
567# @DESCRIPTION: 570# @DESCRIPTION:
568# List variables that should be defined at the top of QtCore/qconfig.h 571# List variables that should be defined at the top of QtCore/qconfig.h
569: ${QCONFIG_DEFINE:=} 572: ${QCONFIG_DEFINE:=}
570 573
571# @FUNCTION: install_qconfigs 574# @FUNCTION: install_qconfigs
575# @INTERNAL
572# @DESCRIPTION: 576# @DESCRIPTION:
573# Install gentoo-specific mkspecs configurations 577# Install gentoo-specific mkspecs configurations.
574install_qconfigs() { 578install_qconfigs() {
575 local x 579 local x
576 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then 580 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
577 for x in QCONFIG_ADD QCONFIG_REMOVE; do 581 for x in QCONFIG_ADD QCONFIG_REMOVE; do
578 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri 582 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
… …
589 doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed" 593 doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed"
590 fi 594 fi
591} 595}
592 596
593# @FUNCTION: generate_qconfigs 597# @FUNCTION: generate_qconfigs
598# @INTERNAL
594# @DESCRIPTION: 599# @DESCRIPTION:
595# Generates gentoo-specific configurations 600# Generates gentoo-specific qconfig.{h,pri}.
596generate_qconfigs() { 601generate_qconfigs() {
597 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then 602 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then
598 local x qconfig_add qconfig_remove qconfig_new 603 local x qconfig_add qconfig_remove qconfig_new
599 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do 604 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
600 [[ -f ${x} ]] || continue 605 [[ -f ${x} ]] || continue
… …
649 fi 654 fi
650} 655}
651 656
652# @FUNCTION: qt4-build_pkg_postrm 657# @FUNCTION: qt4-build_pkg_postrm
653# @DESCRIPTION: 658# @DESCRIPTION:
654# Generate configurations when the package is completely removed 659# Regenerate configuration when the package is completely removed.
655qt4-build_pkg_postrm() { 660qt4-build_pkg_postrm() {
656 generate_qconfigs 661 generate_qconfigs
657} 662}
658 663
659# @FUNCTION: qt4-build_pkg_postinst 664# @FUNCTION: qt4-build_pkg_postinst
660# @DESCRIPTION: 665# @DESCRIPTION:
661# Generate configuration, plus throws a message about possible 666# Regenerate configuration, plus throw a message about possible
662# breakages and proposed solutions. 667# breakages and proposed solutions.
663qt4-build_pkg_postinst() { 668qt4-build_pkg_postinst() {
664 generate_qconfigs 669 generate_qconfigs
665} 670}
666 671
667# @FUNCTION: skip_qmake_build_patch 672# @FUNCTION: skip_qmake_build
673# @INTERNAL
668# @DESCRIPTION: 674# @DESCRIPTION:
669# Don't need to build qmake, as it's already installed from qt-core 675# Patches configure to skip qmake compilation, as it's already installed by qt-core.
670skip_qmake_build_patch() { 676skip_qmake_build() {
671 # Don't need to build qmake, as it's already installed from qt-core
672 sed -i -e "s:if true:if false:g" "${S}"/configure || die "Sed failed" 677 sed -i -e "s:if true:if false:g" "${S}"/configure || die
673} 678}
674 679
675# @FUNCTION: skip_project_generation_patch 680# @FUNCTION: skip_project_generation
681# @INTERNAL
676# @DESCRIPTION: 682# @DESCRIPTION:
677# Exit the script early by throwing in an exit before all of the .pro files are scanned 683# Exit the script early by throwing in an exit before all of the .pro files are scanned.
678skip_project_generation_patch() { 684skip_project_generation() {
679 # Exit the script early by throwing in an exit before all of the .pro files are scanned
680 sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \ 685 sed -i -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" "${S}"/configure || die
681 -i "${S}"/configure || die "Sed failed"
682} 686}
683 687
684# @FUNCTION: symlink_binaries_to_buildtree 688# @FUNCTION: symlink_binaries_to_buildtree
689# @INTERNAL
685# @DESCRIPTION: 690# @DESCRIPTION:
686# Symlink generated binaries to buildtree so they can be used during compilation 691# Symlinks generated binaries to buildtree, so they can be used during compilation time.
687# time
688symlink_binaries_to_buildtree() { 692symlink_binaries_to_buildtree() {
689 for bin in qmake moc uic rcc; do 693 for bin in qmake moc uic rcc; do
690 ln -s ${QTBINDIR}/${bin} "${S}"/bin/ || die "Symlinking ${bin} to ${S}/bin failed." 694 ln -s "${QTBINDIR}"/${bin} "${S}"/bin/ || die "symlinking ${bin} to ${S}/bin failed"
691 done 695 done
692} 696}
693 697
694# @FUNCTION: fix_library_files 698# @FUNCTION: fix_library_files
699# @INTERNAL
695# @DESCRIPTION: 700# @DESCRIPTION:
696# Fixes the pathes in *.la, *.prl, *.pc, as they are wrong due to sandbox and 701# Fixes the paths in *.la, *.prl, *.pc, as they are wrong due to sandbox and
697# moves the *.pc-files into the pkgconfig directory 702# moves the *.pc files into the pkgconfig directory.
698fix_library_files() { 703fix_library_files() {
704 local libfile
699 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do 705 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do
700 if [[ -e ${libfile} ]]; then 706 if [[ -e ${libfile} ]]; then
701 sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "Sed on ${libfile} failed." 707 sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "sed on ${libfile} failed"
702 fi 708 fi
703 done 709 done
704 710
705 # pkgconfig files refer to WORKDIR/bin as the moc and uic locations. Fix: 711 # pkgconfig files refer to WORKDIR/bin as the moc and uic locations
706 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do 712 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do
707 if [[ -e ${libfile} ]]; then 713 if [[ -e ${libfile} ]]; then
708 sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "Sed failed" 714 sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "sed on ${libfile} failed"
709 715
710 # Move .pc files into the pkgconfig directory 716 # Move .pc files into the pkgconfig directory
711 dodir ${QTPCDIR#${EPREFIX}} 717 dodir ${QTPCDIR#${EPREFIX}}
712 mv ${libfile} "${D}"/${QTPCDIR}/ \ 718 mv ${libfile} "${D}"/${QTPCDIR}/ || die "moving ${libfile} to ${D}/${QTPCDIR}/ failed"
713 || die "Moving ${libfile} to ${D}/${QTPCDIR}/ failed."
714 fi 719 fi
715 done 720 done
716 721
717 # Don't install an empty directory 722 # Don't install an empty directory
718 rmdir "${D}"/${QTLIBDIR}/pkgconfig 723 rmdir "${D}"/${QTLIBDIR}/pkgconfig
719} 724}
720 725
721# @FUNCTION: qt_use 726# @FUNCTION: qt_use
722# @USAGE: < flag > [ feature ] [ enableval ] 727# @USAGE: < flag > [ feature ] [ enableval ]
723# @DESCRIPTION: 728# @DESCRIPTION:
724# This will echo "${enableval}-${feature}" if <flag> is enabled, or 729# This will echo "-${enableval}-${feature}" if <flag> is enabled, or
725# "-no-${feature} if the flag is disabled. If [feature] is not specified <flag> 730# "-no-${feature}" if it's disabled. If [feature] is not specified, <flag>
726# will be used for that. If [enableval] is not specified, it omits the 731# will be used for that. If [enableval] is not specified, it omits the
727# assignment-part 732# "-${enableval}" part.
728qt_use() { 733qt_use() {
729 local flag=$1 734 use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
730 local feature=$1
731 local enableval=
732
733 [[ -n $2 ]] && feature=$2
734 [[ -n $3 ]] && enableval=-$3
735
736 if use ${flag}; then
737 echo "${enableval}-${feature}"
738 else
739 echo "-no-${feature}"
740 fi
741} 735}
742 736
743# @FUNCTION: qt_mkspecs_dir 737# @FUNCTION: qt_mkspecs_dir
744# @RETURN: the specs-directory w/o path 738# @RETURN: the specs-directory w/o path
745# @DESCRIPTION: 739# @DESCRIPTION:
746# Allows us to define which mkspecs dir we want to use. 740# Allows us to define which mkspecs dir we want to use.
747qt_mkspecs_dir() { 741qt_mkspecs_dir() {
748 # Allows us to define which mkspecs dir we want to use.
749 local spec 742 local spec=
750
751 case ${CHOST} in 743 case ${CHOST} in
752 *-freebsd*|*-dragonfly*) 744 *-freebsd*|*-dragonfly*)
753 spec=freebsd ;; 745 spec=freebsd ;;
754 *-openbsd*) 746 *-openbsd*)
755 spec=openbsd ;; 747 spec=openbsd ;;
… …
767 *-solaris*) 759 *-solaris*)
768 spec=solaris ;; 760 spec=solaris ;;
769 *-linux-*|*-linux) 761 *-linux-*|*-linux)
770 spec=linux ;; 762 spec=linux ;;
771 *) 763 *)
772 die "Unknown CHOST, no platform choosen." 764 die "Unknown CHOST, no platform chosen"
773 esac 765 esac
774 766
775 CXX=$(tc-getCXX) 767 CXX=$(tc-getCXX)
776 if [[ ${CXX} == *g++* ]]; then 768 if [[ ${CXX} == *g++* ]]; then
777 spec+=-g++ 769 spec+=-g++
778 elif [[ ${CXX} == *icpc* ]]; then 770 elif [[ ${CXX} == *icpc* ]]; then
779 spec+=-icc 771 spec+=-icc
780 else 772 else
781 die "Unknown compiler ${CXX}." 773 die "Unknown compiler '${CXX}'"
782 fi 774 fi
783 if [[ -n ${LIBDIR/lib} ]]; then 775 if [[ -n ${LIBDIR/lib} ]]; then
784 spec+=-${LIBDIR/lib} 776 spec+=-${LIBDIR/lib}
785 fi 777 fi
786 778
… …
796 788
797 echo "${spec}" 789 echo "${spec}"
798} 790}
799 791
800# @FUNCTION: qt_assistant_cleanup 792# @FUNCTION: qt_assistant_cleanup
801# @RETURN: nothing 793# @INTERNAL
802# @DESCRIPTION: 794# @DESCRIPTION:
803# Tries to clean up tools.pro for qt-assistant ebuilds 795# Tries to clean up tools.pro for qt-assistant ebuilds.
804# Meant to be called in src_prepare 796# Meant to be called in src_prepare().
797# Since Qt 4.7.4 this function is a no-op.
805qt_assistant_cleanup() { 798qt_assistant_cleanup() {
799 # apply patching to qt-assistant ebuilds only
800 [[ ${PN} != "qt-assistant" ]] && return
801
802 # no longer needed for 4.7.4 and later
803 version_is_at_least "4.7.4" && return
804
806 # different versions (and branches...) may need different handling, 805 # different versions (and branches...) may need different handling,
807 # add a case if you need special handling 806 # add a case if you need special handling
808 case "${MY_PV_EXTRA}" in 807 case "${MY_PV_EXTRA}" in
809 *kde-qt*) 808 *kde-qt*)
810 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \ 809 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \
… …
819 ;; 818 ;;
820 esac 819 esac
821} 820}
822 821
823# @FUNCTION: qt_nolibx11 822# @FUNCTION: qt_nolibx11
824# @RETURN: nothing 823# @INTERNAL
825# @DESCRIPTION: 824# @DESCRIPTION:
826# Ignore X11 tests for packages that don't need X libraries installed 825# Ignore X11 tests for packages that don't need X libraries installed.
827qt_nolibx11() { 826qt_nolibx11() {
828 einfo "removing X11 check to allow X-less compilation"
829 sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure || 827 sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure ||
830 die "x11 check sed failed" 828 die "x11 check sed failed"
831} 829}
832 830
833EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst 831EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst
Legend:
Removed from v.1.93  
changed lines
  Added in v.1.111
  ViewVC Help
Powered by ViewVC 1.1.20