/[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.86 Revision 1.111
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.86 2010/11/13 20:30:26 wired 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"
32[[ ${CATEGORY}/${PN} != x11-themes/qgtkstyle ]] &&
33 IUSE+=" pch aqua"
34
35RDEPEND=" 32RDEPEND="
36 !<x11-libs/qt-assistant-${PV} 33 !<x11-libs/qt-assistant-${PV}
37 !>x11-libs/qt-assistant-${PV}-r9999 34 !>x11-libs/qt-assistant-${PV}-r9999
38 !<x11-libs/qt-core-${PV} 35 !<x11-libs/qt-core-${PV}
39 !>x11-libs/qt-core-${PV}-r9999 36 !>x11-libs/qt-core-${PV}-r9999
40 !<x11-libs/qt-dbus-${PV} 37 !<x11-libs/qt-dbus-${PV}
41 !>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
42 !<x11-libs/qt-demo-${PV} 41 !<x11-libs/qt-demo-${PV}
43 !>x11-libs/qt-demo-${PV}-r9999 42 !>x11-libs/qt-demo-${PV}-r9999
44 !<x11-libs/qt-gui-${PV} 43 !<x11-libs/qt-gui-${PV}
45 !>x11-libs/qt-gui-${PV}-r9999 44 !>x11-libs/qt-gui-${PV}-r9999
46 !<x11-libs/qt-multimedia-${PV} 45 !<x11-libs/qt-multimedia-${PV}
67 66
68S=${WORKDIR}/${MY_P} 67S=${WORKDIR}/${MY_P}
69 68
70# @FUNCTION: qt4-build_pkg_setup 69# @FUNCTION: qt4-build_pkg_setup
71# @DESCRIPTION: 70# @DESCRIPTION:
72# Sets up S, MY_P, PATH, and LD_LIBRARY_PATH 71# Sets up PATH and LD_LIBRARY_PATH.
73qt4-build_pkg_setup() { 72qt4-build_pkg_setup() {
74 [[ ${EAPI} == 2 ]] && use !prefix && EPREFIX= 73 [[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
75 74
76 # Protect users by not allowing downgrades between releases 75 # Protect users by not allowing downgrades between releases
77 # Downgrading revisions within the same release should be allowed 76 # Downgrading revisions within the same release should be allowed
78 if has_version '>'${CATEGORY}/${P}-r9999 ; then 77 if has_version '>'${CATEGORY}/${P}-r9999; then
79 if [[ -z $I_KNOW_WHAT_I_AM_DOING ]] ; then 78 if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
80 eerror "Sanity check to keep you from breaking your system:" 79 eerror "Sanity check to keep you from breaking your system:"
81 eerror " Downgrading Qt is completely unsupported and will break your system!" 80 eerror " Downgrading Qt is completely unsupported and will break your system!"
82 die "aborting to save your system" 81 die "aborting to save your system"
83 else 82 else
84 ewarn "Downgrading Qt is completely unsupported and will break your system!" 83 ewarn "Downgrading Qt is completely unsupported and will break your system!"
85 fi 84 fi
86 fi 85 fi
87 86
88 if [[ "${PN}" == "qt-webkit" ]]; then 87 if [[ ${PN} == "qt-webkit" ]]; then
89 eshopts_push -s extglob 88 eshopts_push -s extglob
90 if is-flagq '-g?(gdb)?([1-9])'; then 89 if is-flagq '-g?(gdb)?([1-9])'; then
91 echo 90 echo
92 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)."
93 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."
124 fi 123 fi
125} 124}
126 125
127# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES 126# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
128# @DESCRIPTION: 127# @DESCRIPTION:
129# Arguments for build_target_directories. Takes the directories, in which the 128# Arguments for build_target_directories. Takes the directories in which the
130# code should be compiled. This is a space-separated list 129# code should be compiled. This is a space-separated list.
131 130
132# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES 131# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
133# @DESCRIPTION: 132# @DESCRIPTION:
134# Space separated list including the directories that will be extracted from Qt 133# Space-separated list including the directories that will be extracted from
135# tarball 134# Qt tarball.
136 135
137# @FUNCTION: qt4-build_src_unpack 136# @FUNCTION: qt4-build_src_unpack
138# @DESCRIPTION: 137# @DESCRIPTION:
139# Unpacks the sources 138# Unpacks the sources.
140qt4-build_src_unpack() { 139qt4-build_src_unpack() {
141 setqtenv 140 setqtenv
142 local target targets= 141 local target targets=
143 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \ 142 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
144 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 echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} 148 echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets}
150 tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die 149 tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die
151} 150}
152 151
153# @ECLASS-VARIABLE: PATCHES 152# @ECLASS-VARIABLE: PATCHES
153# @DEFAULT_UNSET
154# @DESCRIPTION: 154# @DESCRIPTION:
155# 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.
156# 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.
157# example: 157# Make sure to specify the full path. This variable is utilised in
158# PATCHES="${FILESDIR}"/mypatch.patch 158# src_unpack/src_prepare phase, based on EAPI.
159# ${FILESDIR}"/mypatch2.patch"
160# 159#
160# @CODE
161# PATCHES=( "${FILESDIR}/mypatch.patch"
162# "${FILESDIR}/patches_folder/" )
163# @CODE
161 164
162# @FUNCTION: qt4-build_src_prepare 165# @FUNCTION: qt4-build_src_prepare
163# @DESCRIPTION: 166# @DESCRIPTION:
164# 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
165# 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.
166qt4-build_src_prepare() { 169qt4-build_src_prepare() {
167 setqtenv 170 setqtenv
168 cd "${S}" 171 cd "${S}"
169 172
170 # fix qt 4.7 regression that skips -fvisibility=hidden
171 if version_is_at_least "4.7.0_beta1"; then 173 if version_is_at_least "4.7"; then
172 sed -e "s/^gcc|g++)/*gcc|*g++)/" \
173 -i config.tests/unix/fvisibility.test ||
174 die "visibility fixing sed failed"
175 fi
176 # fix libx11 dependency on non X packages 174 # fix libX11 dependency on non X packages
177 if version_is_at_least "4.7.0_beta2"; then
178 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"
179 hasq ${PN} ${NOLIBX11PKG} && qt_nolibx11 176 has ${PN} ${nolibx11_pkgs} && qt_nolibx11
180 [[ ${PN} == "qt-assistant" ]] && qt_assistant_cleanup 177
178 qt_assistant_cleanup
181 fi 179 fi
182 180
183 if use aqua; then 181 if use aqua; then
184 # provide a proper macx-g++-64 182 # provide a proper macx-g++-64
185 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir) 183 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir)
186 184
187 sed -e '/^CONFIG/s:app_bundle::' \ 185 sed -e '/^CONFIG/s:app_bundle::' \
188 -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:' \
189 -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed failed" 187 -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
190 fi 188 fi
191 189
192 if [[ ${PN} != qt-core ]]; then 190 if [[ ${PN} != qt-core ]]; then
193 skip_qmake_build_patch 191 skip_qmake_build
194 skip_project_generation_patch 192 skip_project_generation
195 symlink_binaries_to_buildtree 193 symlink_binaries_to_buildtree
196 fi 194 fi
197 195
198 if [[ ${CHOST} == *86*-apple-darwin* ]] ; then 196 if [[ ${CHOST} == *86*-apple-darwin* ]] ; then
199 # qmake bus errors with -O2 but -O3 works 197 # qmake bus errors with -O2 but -O3 works
202 200
203 # Bug 178652 201 # Bug 178652
204 if [[ $(gcc-major-version) == 3 ]] && use amd64; then 202 if [[ $(gcc-major-version) == 3 ]] && use amd64; then
205 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS" 203 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
206 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
207 fi 214 fi
208 215
209 # Unsupported old gcc versions - hardened needs this :( 216 # Unsupported old gcc versions - hardened needs this :(
210 if [[ $(gcc-major-version) -lt 4 ]] ; then 217 if [[ $(gcc-major-version) -lt 4 ]] ; then
211 ewarn "Appending -fno-stack-protector to CXXFLAGS" 218 ewarn "Appending -fno-stack-protector to CXXFLAGS"
212 append-cxxflags -fno-stack-protector 219 append-cxxflags -fno-stack-protector
213 # Bug 253127 220 # Bug 253127
214 sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \ 221 sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \
215 -i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed" 222 -i mkspecs/common/g++.conf || die
216 fi 223 fi
217 224
218 # Bug 261632 225 # Bug 261632
219 if use ppc64; then 226 if use ppc64; then
220 ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS" 227 ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS"
221 append-flags -mminimal-toc 228 append-flags -mminimal-toc
222 fi 229 fi
223 230
224 # Bug 282984 && Bug 295530 231 # Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
225 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 \
226 -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
227 # bug 321335 240 # Bug 321335
228 if version_is_at_least 4.6; then
229 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 \
230 xargs -0 \
231 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" \
232 -i || die "sed test compilers failed" 243 -i || die "sed test compilers failed"
233 fi
234 244
235 # Bug 172219 245 # Bug 172219
236 sed -e "s:X11R6/::" \ 246 sed -e "s:X11R6/::" -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
237 -i "${S}"/mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed ${S}/mkspecs/$(qt_mkspecs_dir)/qmake.conf failed"
238 247
239 if [[ ${CHOST} == *-darwin* ]]; then 248 if [[ ${CHOST} == *-darwin* ]]; then
240 # Set FLAGS *and* remove -arch, since our gcc-apple is multilib 249 # Set FLAGS *and* remove -arch, since our gcc-apple is multilib
241 # crippled (by design) :/ 250 # crippled (by design) :/
242 sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ 251 sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
256 -e "s:-arch \$i::" \ 265 -e "s:-arch \$i::" \
257 -e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \ 266 -e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \
258 -e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \ 267 -e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \
259 -e "s:-Xarch_x86_64::g" \ 268 -e "s:-Xarch_x86_64::g" \
260 -e "s:-Xarch_ppc64::g" \ 269 -e "s:-Xarch_ppc64::g" \
261 -i configure mkspecs/common/mac-g++.conf || die "sed configure failed" 270 -i configure mkspecs/common/mac-g++.conf || die "sed -arch/-Xarch failed"
262 271
263 # 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.
264 if [[ ${CHOST} == *-apple-darwin10 ]] ; then 273 if [[ ${CHOST} == *-apple-darwin10 ]] ; then
265 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" \
266 -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" \
267 -i configure mkspecs/common/mac-g++.conf || die "sed configure failed" 276 -i configure mkspecs/common/mac-g++.conf || die "sed deployment target failed"
268 fi 277 fi
269 fi 278 fi
270 279
271 # 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
272 # Darwin, for which the sources already cater for -liconv 281 # Darwin, for which the sources already cater for -liconv
302 # 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
303 # Darwin, for which the sources already cater for -liconv 312 # Darwin, for which the sources already cater for -liconv
304 use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \ 313 use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \
305 myconf+=" -liconv" 314 myconf+=" -liconv"
306 315
307 if has glib ${IUSE//+} && use glib; then 316 if use_if_iuse glib; then
308 # use -I, -L and -l from configure 317 # use -I, -L and -l from configure
309 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)"
310 # avoid the -pthread argument 319 # avoid the -pthread argument
311 myconf+=" ${glibflags//-pthread}" 320 myconf+=" ${glibflags//-pthread}"
312 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"
313 fi 331 fi
314 332
315 if use aqua ; then 333 if use aqua ; then
316 # On (snow) leopard use the new (frameworked) cocoa code. 334 # On (snow) leopard use the new (frameworked) cocoa code.
317 if [[ ${CHOST##*-darwin} -ge 9 ]] ; then 335 if [[ ${CHOST##*-darwin} -ge 9 ]] ; then
333 # freetype2 include dir is non-standard, thus include it on configure 351 # freetype2 include dir is non-standard, thus include it on configure
334 # use -I from configure 352 # use -I from configure
335 myconf+=" $(pkg-config --cflags freetype2)" 353 myconf+=" $(pkg-config --cflags freetype2)"
336 fi 354 fi
337 355
338 # Disable SSE4.x, since auto-detection is currently broken
339 # Upstream bug http://bugreports.qt.nokia.com/browse/QTBUG-13623
340 if version_is_at_least 4.7.1; then
341 myconf+=" -no-sse4.1 -no-sse4.2"
342 fi
343
344 echo ./configure ${myconf} 356 echo ./configure ${myconf}
345 ./configure ${myconf} || die "./configure failed" 357 ./configure ${myconf} || die "./configure failed"
346 myconf="" 358 myconf=""
359
360 prepare_directories ${QT4_TARGET_DIRECTORIES}
347} 361}
348 362
349# @FUNCTION: qt4-build_src_compile 363# @FUNCTION: qt4-build_src_compile
364# @DESCRIPTION:
350# @DESCRIPTION: Actual compile phase 365# Actual compile phase
351qt4-build_src_compile() { 366qt4-build_src_compile() {
352 setqtenv 367 setqtenv
353 368
354 build_directories ${QT4_TARGET_DIRECTORIES} 369 build_directories ${QT4_TARGET_DIRECTORIES}
355} 370}
363 done 378 done
364} 379}
365 380
366# @FUNCTION: fix_includes 381# @FUNCTION: fix_includes
367# @DESCRIPTION: 382# @DESCRIPTION:
368# For MacOSX we need to add some symlinks when frameworks are 383# For MacOS X we need to add some symlinks when frameworks are
369# 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.
370fix_includes() { 385fix_includes() {
371 if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then 386 if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
372 # Some packages tend to include <Qt/...> 387 # Some packages tend to include <Qt/...>
373 dodir "${QTHEADERDIR#${EPREFIX}}"/Qt 388 dodir "${QTHEADERDIR#${EPREFIX}}"/Qt
393# @DESCRIPTION: 408# @DESCRIPTION:
394# Perform the actual installation including some library fixes. 409# Perform the actual installation including some library fixes.
395qt4-build_src_install() { 410qt4-build_src_install() {
396 [[ ${EAPI} == 2 ]] && use !prefix && ED=${D} 411 [[ ${EAPI} == 2 ]] && use !prefix && ED=${D}
397 setqtenv 412 setqtenv
413
398 install_directories ${QT4_TARGET_DIRECTORIES} 414 install_directories ${QT4_TARGET_DIRECTORIES}
399 install_qconfigs 415 install_qconfigs
400 fix_library_files 416 fix_library_files
401 fix_includes 417 fix_includes
418
402 # remove .la files since we are building only shared Qt libraries 419 # remove .la files since we are building only shared Qt libraries
403 find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm 420 find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm
404} 421}
405 422
406# @FUNCTION: setqtenv 423# @FUNCTION: setqtenv
424# @INTERNAL
407setqtenv() { 425setqtenv() {
408 # Set up installation directories 426 # Set up installation directories
409 QTBASEDIR=${EPREFIX}/usr/$(get_libdir)/qt4
410 QTPREFIXDIR=${EPREFIX}/usr 427 QTPREFIXDIR=${EPREFIX}/usr
411 QTBINDIR=${EPREFIX}/usr/bin 428 QTBINDIR=${EPREFIX}/usr/bin
412 QTLIBDIR=${EPREFIX}/usr/$(get_libdir)/qt4 429 QTLIBDIR=${EPREFIX}/usr/$(get_libdir)/qt4
413 QMAKE_LIBDIR_QT=${QTLIBDIR}
414 QTPCDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig 430 QTPCDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig
415 QTDATADIR=${EPREFIX}/usr/share/qt4
416 QTDOCDIR=${EPREFIX}/usr/share/doc/qt-${PV} 431 QTDOCDIR=${EPREFIX}/usr/share/doc/qt-${PV}
417 QTHEADERDIR=${EPREFIX}/usr/include/qt4 432 QTHEADERDIR=${EPREFIX}/usr/include/qt4
418 QTPLUGINDIR=${QTLIBDIR}/plugins 433 QTPLUGINDIR=${QTLIBDIR}/plugins
434 QTIMPORTDIR=${QTLIBDIR}/imports
435 QTDATADIR=${EPREFIX}/usr/share/qt4
436 QTTRANSDIR=${QTDATADIR}/translations
419 QTSYSCONFDIR=${EPREFIX}/etc/qt4 437 QTSYSCONFDIR=${EPREFIX}/etc/qt4
420 QTTRANSDIR=${QTDATADIR}/translations
421 QTEXAMPLESDIR=${QTDATADIR}/examples 438 QTEXAMPLESDIR=${QTDATADIR}/examples
422 QTDEMOSDIR=${QTDATADIR}/demos 439 QTDEMOSDIR=${QTDATADIR}/demos
440 QMAKE_LIBDIR_QT=${QTLIBDIR}
423 QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4 441 QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4
442
424 PLATFORM=$(qt_mkspecs_dir) 443 PLATFORM=$(qt_mkspecs_dir)
425 444
426 unset QMAKESPEC 445 unset QMAKESPEC
427} 446}
428 447
429# @FUNCTION: standard_configure_options 448# @FUNCTION: standard_configure_options
449# @INTERNAL
430# @DESCRIPTION: 450# @DESCRIPTION:
431# Sets up some standard configure options, like libdir (if necessary), whether 451# Sets up some standard configure options, like libdir (if necessary), whether
432# debug info is wanted or not. 452# debug info is wanted or not.
433standard_configure_options() { 453standard_configure_options() {
434 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"
435 460
436 [[ $(get_libdir) != lib ]] && myconf+=" -L${EPREFIX}/usr/$(get_libdir)" 461 [[ $(get_libdir) != lib ]] && myconf+=" -L${EPREFIX}/usr/$(get_libdir)"
437 462
438 # Disable visibility explicitly if gcc version isn't 4 463 # debug/release
439 if [[ $(gcc-major-version) -lt 4 ]]; then
440 myconf+=" -no-reduce-exports"
441 fi
442
443 # precompiled headers doesn't work on hardened, where the flag is masked.
444 myconf+=" $(qt_use pch)"
445
446 if use debug; then 464 if use debug; then
447 myconf+=" -debug" 465 myconf+=" -debug"
448 else 466 else
449 myconf+=" -release" 467 myconf+=" -release"
450 fi 468 fi
451 myconf+=" -no-separate-debug-info" 469 myconf+=" -no-separate-debug-info"
452 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
453 use aqua && myconf+=" -no-framework" 489 use aqua && myconf+=" -no-framework"
454 490
455 # 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
456 # $(tc-arch). Therefore we convert it to supported values. 492 # $(tc-arch). Therefore we convert it to supported values.
457 case "$(tc-arch)" in 493 case "$(tc-arch)" in
458 amd64|x64-*) myconf+=" -arch x86_64" ;; 494 amd64|x64-*) myconf+=" -arch x86_64" ;;
459 ppc-macos) myconf+=" -arch ppc" ;; 495 ppc-macos) myconf+=" -arch ppc" ;;
460 ppc|ppc64|ppc-*) myconf+=" -arch powerpc" ;; 496 ppc|ppc64|ppc-*) myconf+=" -arch powerpc" ;;
461 sparc|sparc-*) myconf+=" -arch sparc" ;; 497 sparc|sparc-*|sparc64-*) myconf+=" -arch sparc" ;;
462 x86-macos) myconf+=" -arch x86" ;; 498 x86-macos) myconf+=" -arch x86" ;;
463 x86|x86-*) myconf+=" -arch i386" ;; 499 x86|x86-*) myconf+=" -arch i386" ;;
464 alpha|arm|ia64|mips|s390|sparc) myconf+=" -arch $(tc-arch)" ;; 500 alpha|arm|ia64|mips|s390) myconf+=" -arch $(tc-arch)" ;;
465 hppa|sh) myconf+=" -arch generic" ;; 501 hppa|sh) myconf+=" -arch generic" ;;
466 *) 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." ;;
467 esac 503 esac
468 504
469 # 4.5: build everything but qt-xmlpatterns w/o exceptions
470 # 4.6: exceptions USE flag
471 local exceptions="-exceptions"
472 case "${PV}" in
473 4.5.*)
474 [[ ${PN} == "qt-xmlpatterns" ]] || exceptions="-no-exceptions"
475 ;;
476 *)
477 has exceptions "${IUSE//+}" && exceptions="$(qt_use exceptions)"
478 ;;
479 esac
480
481 # note about -reduce-relocations:
482 # That flag seems to introduce major breakage to applications,
483 # mostly to be seen as a core dump with the message "QPixmap: Must
484 # construct a QApplication before a QPaintDevice" on Solaris
485 # -- Daniel Vergien
486 [[ ${CHOST} != *-solaris* ]] && myconf+=" -reduce-relocations"
487
488 myconf+=" -platform $(qt_mkspecs_dir) -stl -verbose -largefile -confirm-license
489 -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
490 -datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR}
491 -plugindir ${QTPLUGINDIR} -sysconfdir ${QTSYSCONFDIR}
492 -translationdir ${QTTRANSDIR} -examplesdir ${QTEXAMPLESDIR}
493 -demosdir ${QTDEMOSDIR} -silent -fast -opensource
494 ${exceptions}
495 -nomake examples -nomake demos"
496
497 echo "${myconf}" 505 echo "${myconf}"
498} 506}
499 507
500# @FUNCTION: build_directories 508# @FUNCTION: prepare_directories
501# @USAGE: < directories > 509# @USAGE: < directories >
510# @INTERNAL
502# @DESCRIPTION: 511# @DESCRIPTION:
503# Compiles the code in $QT4_TARGET_DIRECTORIES 512# Generates Makefiles for the given list of directories.
504build_directories() { 513prepare_directories() {
505 for x in "$@"; do 514 for x in "$@"; do
506 pushd "${S}"/${x} >/dev/null 515 pushd "${S}"/${x} >/dev/null || die
516 einfo "Running qmake in: ${x}"
507 # avoid running over the maximum argument number, bug #299810 517 # avoid running over the maximum argument number, bug #299810
508 { 518 {
509 echo "${S}"/mkspecs/common/*.conf 519 echo "${S}"/mkspecs/common/*.conf
510 find "${S}" -name '*.pr[io]' 520 find "${S}" -name '*.pr[io]'
511 } | 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
512 "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed" 525 "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
526 popd >/dev/null || die
527 done
528}
529
530
531# @FUNCTION: build_directories
532# @USAGE: < directories >
533# @INTERNAL
534# @DESCRIPTION:
535# Compiles the code in the given list of directories.
536build_directories() {
537 for x in "$@"; do
538 pushd "${S}"/${x} >/dev/null || die
513 emake CC="$(tc-getCC)" \ 539 emake CC="$(tc-getCC)" \
514 CXX="$(tc-getCXX)" \ 540 CXX="$(tc-getCXX)" \
515 LINK="$(tc-getCXX)" || die "emake failed" 541 LINK="$(tc-getCXX)" || die "emake failed"
516 popd >/dev/null 542 popd >/dev/null || die
517 done 543 done
518} 544}
519 545
520# @FUNCTION: install_directories 546# @FUNCTION: install_directories
521# @USAGE: < directories > 547# @USAGE: < directories >
548# @INTERNAL
522# @DESCRIPTION: 549# @DESCRIPTION:
523# 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.
524install_directories() { 551install_directories() {
525 for x in "$@"; do 552 for x in "$@"; do
526 pushd "${S}"/${x} >/dev/null || die "Can't pushd ${S}/${x}" 553 pushd "${S}"/${x} >/dev/null || die
527 emake INSTALL_ROOT="${D}" install || die "emake install failed" 554 emake INSTALL_ROOT="${D}" install || die "emake install failed"
528 popd >/dev/null || die "Can't popd from ${S}/${x}" 555 popd >/dev/null || die
529 done 556 done
530} 557}
531 558
532# @ECLASS-VARIABLE: QCONFIG_ADD 559# @ECLASS-VARIABLE: QCONFIG_ADD
533# @DESCRIPTION: 560# @DESCRIPTION:
543# @DESCRIPTION: 570# @DESCRIPTION:
544# 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
545: ${QCONFIG_DEFINE:=} 572: ${QCONFIG_DEFINE:=}
546 573
547# @FUNCTION: install_qconfigs 574# @FUNCTION: install_qconfigs
575# @INTERNAL
576# @DESCRIPTION:
548# @DESCRIPTION: Install gentoo-specific mkspecs configurations 577# Install gentoo-specific mkspecs configurations.
549install_qconfigs() { 578install_qconfigs() {
550 local x 579 local x
551 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then 580 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
552 for x in QCONFIG_ADD QCONFIG_REMOVE; do 581 for x in QCONFIG_ADD QCONFIG_REMOVE; do
553 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri 582 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
564 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"
565 fi 594 fi
566} 595}
567 596
568# @FUNCTION: generate_qconfigs 597# @FUNCTION: generate_qconfigs
569# @DESCRIPTION: Generates gentoo-specific configurations 598# @INTERNAL
599# @DESCRIPTION:
600# Generates gentoo-specific qconfig.{h,pri}.
570generate_qconfigs() { 601generate_qconfigs() {
571 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
572 local x qconfig_add qconfig_remove qconfig_new 603 local x qconfig_add qconfig_remove qconfig_new
573 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do 604 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
574 [[ -f ${x} ]] || continue 605 [[ -f ${x} ]] || continue
588 619
589 # generate list of QT_CONFIG entries from the existing list 620 # generate list of QT_CONFIG entries from the existing list
590 # including qconfig_add and excluding qconfig_remove 621 # including qconfig_add and excluding qconfig_remove
591 for x in $(sed -n 's/^QT_CONFIG +=//p' \ 622 for x in $(sed -n 's/^QT_CONFIG +=//p' \
592 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do 623 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do
593 hasq ${x} ${qconfig_remove} || qconfig_new+=" ${x}" 624 has ${x} ${qconfig_remove} || qconfig_new+=" ${x}"
594 done 625 done
595 626
596 # replace the existing QT_CONFIG list with qconfig_new 627 # replace the existing QT_CONFIG list with qconfig_new
597 if ! sed -i -e "s/QT_CONFIG +=.*/QT_CONFIG += ${qconfig_new}/" \ 628 if ! sed -i -e "s/QT_CONFIG +=.*/QT_CONFIG += ${qconfig_new}/" \
598 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then 629 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then
622 fi 653 fi
623 fi 654 fi
624} 655}
625 656
626# @FUNCTION: qt4-build_pkg_postrm 657# @FUNCTION: qt4-build_pkg_postrm
658# @DESCRIPTION:
627# @DESCRIPTION: Generate configurations when the package is completely removed 659# Regenerate configuration when the package is completely removed.
628qt4-build_pkg_postrm() { 660qt4-build_pkg_postrm() {
629 generate_qconfigs 661 generate_qconfigs
630} 662}
631 663
632# @FUNCTION: qt4-build_pkg_postinst 664# @FUNCTION: qt4-build_pkg_postinst
665# @DESCRIPTION:
633# @DESCRIPTION: Generate configuration, plus throws a message about possible 666# Regenerate configuration, plus throw a message about possible
634# breakages and proposed solutions. 667# breakages and proposed solutions.
635qt4-build_pkg_postinst() { 668qt4-build_pkg_postinst() {
636 generate_qconfigs 669 generate_qconfigs
637} 670}
638 671
639# @FUNCTION: skip_qmake_build_patch 672# @FUNCTION: skip_qmake_build
673# @INTERNAL
640# @DESCRIPTION: 674# @DESCRIPTION:
641# 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.
642skip_qmake_build_patch() { 676skip_qmake_build() {
643 # Don't need to build qmake, as it's already installed from qt-core
644 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
645} 678}
646 679
647# @FUNCTION: skip_project_generation_patch 680# @FUNCTION: skip_project_generation
681# @INTERNAL
648# @DESCRIPTION: 682# @DESCRIPTION:
649# 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.
650skip_project_generation_patch() { 684skip_project_generation() {
651 # Exit the script early by throwing in an exit before all of the .pro files are scanned
652 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
653 -i "${S}"/configure || die "Sed failed"
654} 686}
655 687
656# @FUNCTION: symlink_binaries_to_buildtree 688# @FUNCTION: symlink_binaries_to_buildtree
689# @INTERNAL
657# @DESCRIPTION: 690# @DESCRIPTION:
658# 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.
659# time
660symlink_binaries_to_buildtree() { 692symlink_binaries_to_buildtree() {
661 for bin in qmake moc uic rcc; do 693 for bin in qmake moc uic rcc; do
662 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"
663 done 695 done
664} 696}
665 697
666# @FUNCTION: fix_library_files 698# @FUNCTION: fix_library_files
699# @INTERNAL
667# @DESCRIPTION: 700# @DESCRIPTION:
668# 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
669# moves the *.pc-files into the pkgconfig directory 702# moves the *.pc files into the pkgconfig directory.
670fix_library_files() { 703fix_library_files() {
704 local libfile
671 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do 705 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do
672 if [[ -e ${libfile} ]]; then 706 if [[ -e ${libfile} ]]; then
673 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"
674 fi 708 fi
675 done 709 done
676 710
677 # 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
678 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do 712 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do
679 if [[ -e ${libfile} ]]; then 713 if [[ -e ${libfile} ]]; then
680 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"
681 715
682 # Move .pc files into the pkgconfig directory 716 # Move .pc files into the pkgconfig directory
683 dodir ${QTPCDIR#${EPREFIX}} 717 dodir ${QTPCDIR#${EPREFIX}}
684 mv ${libfile} "${D}"/${QTPCDIR}/ \ 718 mv ${libfile} "${D}"/${QTPCDIR}/ || die "moving ${libfile} to ${D}/${QTPCDIR}/ failed"
685 || die "Moving ${libfile} to ${D}/${QTPCDIR}/ failed."
686 fi 719 fi
687 done 720 done
688 721
689 # Don't install an empty directory 722 # Don't install an empty directory
690 rmdir "${D}"/${QTLIBDIR}/pkgconfig 723 rmdir "${D}"/${QTLIBDIR}/pkgconfig
691} 724}
692 725
693# @FUNCTION: qt_use 726# @FUNCTION: qt_use
694# @USAGE: < flag > [ feature ] [ enableval ] 727# @USAGE: < flag > [ feature ] [ enableval ]
695# @DESCRIPTION: 728# @DESCRIPTION:
696# This will echo "${enableval}-${feature}" if <flag> is enabled, or 729# This will echo "-${enableval}-${feature}" if <flag> is enabled, or
697# "-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>
698# 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
699# assignment-part 732# "-${enableval}" part.
700qt_use() { 733qt_use() {
701 local flag=$1 734 use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
702 local feature=$1
703 local enableval=
704
705 [[ -n $2 ]] && feature=$2
706 [[ -n $3 ]] && enableval=-$3
707
708 if use ${flag}; then
709 echo "${enableval}-${feature}"
710 else
711 echo "-no-${feature}"
712 fi
713} 735}
714 736
715# @FUNCTION: qt_mkspecs_dir 737# @FUNCTION: qt_mkspecs_dir
716# @RETURN: the specs-directory w/o path 738# @RETURN: the specs-directory w/o path
717# @DESCRIPTION: 739# @DESCRIPTION:
718# Allows us to define which mkspecs dir we want to use. 740# Allows us to define which mkspecs dir we want to use.
719qt_mkspecs_dir() { 741qt_mkspecs_dir() {
720 # Allows us to define which mkspecs dir we want to use.
721 local spec 742 local spec=
722
723 case ${CHOST} in 743 case ${CHOST} in
724 *-freebsd*|*-dragonfly*) 744 *-freebsd*|*-dragonfly*)
725 spec=freebsd ;; 745 spec=freebsd ;;
726 *-openbsd*) 746 *-openbsd*)
727 spec=openbsd ;; 747 spec=openbsd ;;
739 *-solaris*) 759 *-solaris*)
740 spec=solaris ;; 760 spec=solaris ;;
741 *-linux-*|*-linux) 761 *-linux-*|*-linux)
742 spec=linux ;; 762 spec=linux ;;
743 *) 763 *)
744 die "Unknown CHOST, no platform choosen." 764 die "Unknown CHOST, no platform chosen"
745 esac 765 esac
746 766
747 CXX=$(tc-getCXX) 767 CXX=$(tc-getCXX)
748 if [[ ${CXX} == *g++* ]]; then 768 if [[ ${CXX} == *g++* ]]; then
749 spec+=-g++ 769 spec+=-g++
750 elif [[ ${CXX} == *icpc* ]]; then 770 elif [[ ${CXX} == *icpc* ]]; then
751 spec+=-icc 771 spec+=-icc
752 else 772 else
753 die "Unknown compiler ${CXX}." 773 die "Unknown compiler '${CXX}'"
754 fi 774 fi
755 if [[ -n ${LIBDIR/lib} ]]; then 775 if [[ -n ${LIBDIR/lib} ]]; then
756 spec+=-${LIBDIR/lib} 776 spec+=-${LIBDIR/lib}
757 fi 777 fi
758 778
768 788
769 echo "${spec}" 789 echo "${spec}"
770} 790}
771 791
772# @FUNCTION: qt_assistant_cleanup 792# @FUNCTION: qt_assistant_cleanup
773# @RETURN: nothing 793# @INTERNAL
774# @DESCRIPTION: 794# @DESCRIPTION:
775# Tries to clean up tools.pro for qt-assistant ebuilds 795# Tries to clean up tools.pro for qt-assistant ebuilds.
776# 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.
777qt_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
778 # different versions (and branches...) may need different handling, 805 # different versions (and branches...) may need different handling,
779 # add a case if you need special handling 806 # add a case if you need special handling
780 case "${MY_PV_EXTRA}" in 807 case "${MY_PV_EXTRA}" in
781 *kde-qt*) 808 *kde-qt*)
782 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \ 809 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \
791 ;; 818 ;;
792 esac 819 esac
793} 820}
794 821
795# @FUNCTION: qt_nolibx11 822# @FUNCTION: qt_nolibx11
796# @RETURN: nothing 823# @INTERNAL
797# @DESCRIPTION: 824# @DESCRIPTION:
798# 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.
799qt_nolibx11() { 826qt_nolibx11() {
800 einfo "removing X11 check to allow X-less compilation"
801 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 ||
802 die "x11 check sed failed" 828 die "x11 check sed failed"
803} 829}
804 830
805EXPORT_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.86  
changed lines
  Added in v.1.111

  ViewVC Help
Powered by ViewVC 1.1.20