/[gentoo-x86]/eclass/qt4-build.eclass
Gentoo

Diff of /eclass/qt4-build.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.54 Revision 1.56
1# Copyright 2007-2009 Gentoo Foundation 1# Copyright 1999-2009 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.54 2009/12/06 09:34:36 hwoarang Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.56 2009/12/22 17:04:07 abcd Exp $
4 4
5# @ECLASS: qt4-build.eclass 5# @ECLASS: qt4-build.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Ben de Groot <yngwin@gentoo.org>, 7# Ben de Groot <yngwin@gentoo.org>,
8# Markos Chandras <hwoarang@gentoo.org>, 8# Markos Chandras <hwoarang@gentoo.org>,
… …
12# @DESCRIPTION: 12# @DESCRIPTION:
13# This eclass contains various functions that are used when building Qt4 13# This eclass contains various functions that are used when building Qt4
14 14
15inherit base eutils multilib toolchain-funcs flag-o-matic versionator 15inherit base eutils multilib toolchain-funcs flag-o-matic versionator
16 16
17IUSE="${IUSE} debug pch" 17IUSE="debug pch"
18RDEPEND=" 18RDEPEND="
19 !<x11-libs/qt-assistant-${PV} 19 !<x11-libs/qt-assistant-${PV}
20 !>x11-libs/qt-assistant-${PV}-r9999 20 !>x11-libs/qt-assistant-${PV}-r9999
21 !<x11-libs/qt-core-${PV} 21 !<x11-libs/qt-core-${PV}
22 !>x11-libs/qt-core-${PV}-r9999 22 !>x11-libs/qt-core-${PV}-r9999
… …
43 !<x11-libs/qt-webkit-${PV} 43 !<x11-libs/qt-webkit-${PV}
44 !>x11-libs/qt-webkit-${PV}-r9999 44 !>x11-libs/qt-webkit-${PV}-r9999
45 !<x11-libs/qt-xmlpatterns-${PV} 45 !<x11-libs/qt-xmlpatterns-${PV}
46 !>x11-libs/qt-xmlpatterns-${PV}-r9999 46 !>x11-libs/qt-xmlpatterns-${PV}-r9999
47" 47"
48case "${PV}" in 48
49 4.?.?_rc* | 4.?.?_beta* )
50 SRCTYPE="${SRCTYPE:-opensource-src}"
51 MY_PV="${PV/_/-}" 49MY_PV=${PV/_/-}
52 ;;
53 *)
54 SRCTYPE="${SRCTYPE:-opensource-src}"
55 MY_PV="${PV}"
56 ;;
57esac
58 50
59if version_is_at_least 4.5.99999999 ${PV} ; then 51if version_is_at_least 4.5.99999999 ${PV} ; then
60 MY_P="qt-everywhere-${SRCTYPE}-${MY_PV}" 52 MY_P=qt-everywhere-opensource-src-${MY_PV}
61else 53else
62 MY_P="qt-x11-${SRCTYPE}-${MY_PV}" 54 MY_P=qt-x11-opensource-src-${MY_PV}
63fi 55fi
56
64S=${WORKDIR}/${MY_P} 57S=${WORKDIR}/${MY_P}
65 58
66HOMEPAGE="http://qt.nokia.com/" 59HOMEPAGE="http://qt.nokia.com/"
67if version_is_at_least 4.5.3 ${PV} ; then
68 SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz" 60SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
69else
70 SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.bz2"
71fi
72 61
73case "${PV}" in
74 4.4.?) SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-headers.tar.bz2" ;;
75 *) ;;
76esac
77
78if version_is_at_least 4.5 ${PV} ; then
79 LICENSE="|| ( LGPL-2.1 GPL-3 )" 62LICENSE="|| ( LGPL-2.1 GPL-3 )"
80fi
81 63
82# @FUNCTION: qt4-build_pkg_setup 64# @FUNCTION: qt4-build_pkg_setup
83# @DESCRIPTION: 65# @DESCRIPTION:
84# Sets up installation directories, PLATFORM, PATH, and LD_LIBRARY_PATH 66# Sets up PATH and LD_LIBRARY_PATH
85qt4-build_pkg_setup() { 67qt4-build_pkg_setup() {
86 # EAPI=2 ebuilds set use-deps, others need this: 68 PATH="${S}/bin${PATH:+:}${PATH}"
69 LD_LIBRARY_PATH="${S}/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
70
71 # Make sure ebuilds use the required EAPI
87 if [[ $EAPI != 2 ]]; then 72 if [[ ${EAPI} != 2 ]]; then
88 # Make sure debug setting corresponds with qt-core (bug 258512) 73 eerror "The qt4-build eclass requires EAPI=2, but this ebuild does not"
89 if [[ $PN != "qt-core" ]]; then 74 eerror "have EAPI=2 set. The ebuild author or editor failed. This ebuild needs"
90 use debug && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} 75 eerror "to be fixed. Using qt4-build eclass without EAPI=2 will fail."
91 ~x11-libs/qt-core-${PV} debug" 76 die "qt4-build eclass requires EAPI=2"
92 fi 77 fi
93 78
94 # Check USE requirements
95 qt4-build_check_use
96 fi
97
98 PATH="${S}/bin:${PATH}"
99 LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
100
101 if ! version_is_at_least 4.1 $(gcc-version) ; then 79 if ! version_is_at_least 4.1 $(gcc-version); then
102 ewarn "Using a GCC version lower than 4.1 is not supported!" 80 ewarn "Using a GCC version lower than 4.1 is not supported!"
103 echo 81 echo
104 ebeep 3 82 ebeep 3
105 fi 83 fi
106 84
107 if [[ "${P}" == "qt-core-4.6.0_rc1" ]]; then 85 if [[ ${P} == qt-core-4.6.0_rc1 ]]; then
108 ewarn 86 ewarn
109 ewarn "Binary compatibility broke between 4.6.0_beta1 and 4.6.0_rc1." 87 ewarn "Binary compatibility broke between 4.6.0_beta1 and 4.6.0_rc1."
110 ewarn "If you are upgrading from 4.6.0_beta1, you'll have to" 88 ewarn "If you are upgrading from 4.6.0_beta1, you'll have to"
111 ewarn "re-emerge everything that depends on Qt." 89 ewarn "re-emerge everything that depends on Qt."
112 ewarn "Use the following command:" 90 ewarn "Use the following command:"
113 ewarn 91 ewarn
114 ewarn " emerge -av1 \$(for i in \$(qlist -IC x11-libs/qt-);" 92 ewarn " emerge -av1 \$(for i in \$(qlist -IC x11-libs/qt-);"
115 ewarn " do equery -q d \$i | grep -v 'x11-libs/qt-' |" 93 ewarn " do equery -q d \$i | grep -v 'x11-libs/qt-' |"
116 ewarn " sed \"s/^/=/\"; done)" 94 ewarn " sed \"s/^/=/\"; done)"
117 ewarn 95 ewarn
118 ewarn "YOU'VE BEEN WARNED" 96 ewarn "YOU'VE BEEN WARNED"
119 ewarn 97 ewarn
120 ebeep 3 98 ebeep 3
121 fi 99 fi
122 100
123} 101}
124 102
125# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES 103# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
126# @DESCRIPTION: 104# @DESCRIPTION:
127# Arguments for build_target_directories. Takes the directories, in which the 105# Arguments for build_target_directories. Takes the directories, in which the
… …
135# @FUNCTION: qt4-build_src_unpack 113# @FUNCTION: qt4-build_src_unpack
136# @DESCRIPTION: 114# @DESCRIPTION:
137# Unpacks the sources 115# Unpacks the sources
138qt4-build_src_unpack() { 116qt4-build_src_unpack() {
139 setqtenv 117 setqtenv
140 local target targets licenses tar_pkg tar_args 118 local target targets=
141 if version_is_at_least 4.5 ${PV} ; then 119 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
142 licenses="LICENSE.GPL3 LICENSE.LGPL"
143 else
144 licenses="LICENSE.GPL2 LICENSE.GPL3"
145 fi
146 for target in configure ${licenses} projects.pro \
147 src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \ 120 src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \
148 ${QT4_EXTRACT_DIRECTORIES}; do 121 ${QT4_EXTRACT_DIRECTORIES}; do
149 targets="${targets} ${MY_P}/${target}" 122 targets+=" ${MY_P}/${target}"
150 done 123 done
151 124
152 tar_pkg=${MY_P}.tar.bz2
153 tar_args="xjpf"
154 if version_is_at_least 4.5.3 ${PV} ; then
155 tar_pkg=${tar_pkg/bz2/gz}
156 tar_args="xzpf"
157 fi
158
159 echo tar ${tar_args} "${DISTDIR}"/${tar_pkg} ${targets}
160 tar ${tar_args} "${DISTDIR}"/${tar_pkg} ${targets}
161
162 case "${PV}" in
163 4.4.?)
164 echo tar xjpf "${DISTDIR}"/${MY_P}-headers.tar.bz2 125 echo tar xzpf "${DISTDIR}"/${MY_P}.tar.gz ${targets}
165 tar xjpf "${DISTDIR}"/${MY_P}-headers.tar.bz2 126 tar xzpf "${DISTDIR}"/${MY_P}.tar.gz ${targets}
166 ;;
167 esac
168
169 # Be backwards compatible for now
170 if [[ $EAPI != 2 ]]; then
171 qt4-build_src_prepare
172 fi
173} 127}
174 128
175# @ECLASS-VARIABLE: PATCHES 129# @ECLASS-VARIABLE: PATCHES
176# @DESCRIPTION: 130# @DESCRIPTION:
177# In case you have patches to apply, specify them in PATCHES variable. Make sure 131# In case you have patches to apply, specify them in PATCHES variable. Make sure
… …
200 -i configure || die "sed qmake compilers failed" 154 -i configure || die "sed qmake compilers failed"
201 sed -e "s:\(\$MAKE\):\1 CC=$(tc-getCC) CXX=$(tc-getCXX) LD=$(tc-getCXX):" \ 155 sed -e "s:\(\$MAKE\):\1 CC=$(tc-getCC) CXX=$(tc-getCXX) LD=$(tc-getCXX):" \
202 -i config.tests/unix/compile.test || die "sed test compilers failed" 156 -i config.tests/unix/compile.test || die "sed test compilers failed"
203 157
204 # Bug 178652 158 # Bug 178652
205 if [[ "$(gcc-major-version)" == "3" ]] && use amd64; then 159 if [[ $(gcc-major-version) == 3 ]] && use amd64; then
206 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS" 160 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
207 append-flags -fno-gcse 161 append-flags -fno-gcse
208 fi 162 fi
209 163
210 # Unsupported old gcc versions - hardened needs this :( 164 # Unsupported old gcc versions - hardened needs this :(
211 if [[ $(gcc-major-version) -lt "4" ]] ; then 165 if [[ $(gcc-major-version) -lt 4 ]] ; then
212 ewarn "Appending -fno-stack-protector to CXXFLAGS" 166 ewarn "Appending -fno-stack-protector to CXXFLAGS"
213 append-cxxflags -fno-stack-protector 167 append-cxxflags -fno-stack-protector
214 # Bug 253127 168 # Bug 253127
215 sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \ 169 sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \
216 -i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed" 170 -i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed"
… …
251 205
252# @FUNCTION: qt4-build_src_compile 206# @FUNCTION: qt4-build_src_compile
253# @DESCRIPTION: Actual compile phase 207# @DESCRIPTION: Actual compile phase
254qt4-build_src_compile() { 208qt4-build_src_compile() {
255 setqtenv 209 setqtenv
256 # Be backwards compatible for now
257 if [[ $EAPI != 2 ]]; then
258 qt4-build_src_configure
259 fi
260 210
261 build_directories "${QT4_TARGET_DIRECTORIES}" 211 build_directories ${QT4_TARGET_DIRECTORIES}
262} 212}
263 213
264# @FUNCTION: qt4-build_src_install 214# @FUNCTION: qt4-build_src_install
265# @DESCRIPTION: 215# @DESCRIPTION:
266# Perform the actual installation including some library fixes. 216# Perform the actual installation including some library fixes.
267qt4-build_src_install() { 217qt4-build_src_install() {
268 setqtenv 218 setqtenv
269 install_directories "${QT4_TARGET_DIRECTORIES}" 219 install_directories ${QT4_TARGET_DIRECTORIES}
270 install_qconfigs 220 install_qconfigs
271 fix_library_files 221 fix_library_files
272} 222}
273 223
274# @FUNCTION: setqtenv 224# @FUNCTION: setqtenv
… …
297# @FUNCTION: standard_configure_options 247# @FUNCTION: standard_configure_options
298# @DESCRIPTION: 248# @DESCRIPTION:
299# Sets up some standard configure options, like libdir (if necessary), whether 249# Sets up some standard configure options, like libdir (if necessary), whether
300# debug info is wanted or not. 250# debug info is wanted or not.
301standard_configure_options() { 251standard_configure_options() {
302 local myconf="" 252 local myconf=
303 253
304 [[ $(get_libdir) != "lib" ]] && myconf="${myconf} -L/usr/$(get_libdir)" 254 [[ $(get_libdir) != lib ]] && myconf+=" -L/usr/$(get_libdir)"
305 255
306 # Disable visibility explicitly if gcc version isn't 4 256 # Disable visibility explicitly if gcc version isn't 4
307 if [[ "$(gcc-major-version)" -lt "4" ]]; then 257 if [[ $(gcc-major-version) -lt 4 ]]; then
308 myconf="${myconf} -no-reduce-exports" 258 myconf+=" -no-reduce-exports"
309 fi 259 fi
310 260
311 # precompiled headers doesn't work on hardened, where the flag is masked. 261 # precompiled headers doesn't work on hardened, where the flag is masked.
262 myconf+=" $(qt_use pch)"
263
312 if use pch; then 264 if use debug; then
313 myconf="${myconf} -pch" 265 myconf+=" -debug"
314 else 266 else
315 myconf="${myconf} -no-pch" 267 myconf+=" -release"
316 fi 268 fi
317
318 if use debug; then
319 myconf="${myconf} -debug -no-separate-debug-info" 269 myconf+=" -no-separate-debug-info"
320 else
321 myconf="${myconf} -release -no-separate-debug-info"
322 fi
323 270
324 # ARCH is set on Gentoo. Qt now falls back to generic on an unsupported 271 # ARCH is set on Gentoo. Qt now falls back to generic on an unsupported
325 # $(tc-arch). Therefore we convert it to supported values. 272 # $(tc-arch). Therefore we convert it to supported values.
326 case "$(tc-arch)" in 273 case "$(tc-arch)" in
327 amd64) myconf="${myconf} -arch x86_64" ;; 274 amd64) myconf+=" -arch x86_64" ;;
328 ppc|ppc64) myconf="${myconf} -arch powerpc" ;; 275 ppc|ppc64) myconf+=" -arch powerpc" ;;
329 x86|x86-*) myconf="${myconf} -arch i386" ;; 276 x86|x86-*) myconf+=" -arch i386" ;;
330 alpha|arm|ia64|mips|s390|sparc) myconf="${myconf} -arch $(tc-arch)" ;; 277 alpha|arm|ia64|mips|s390|sparc) myconf+=" -arch $(tc-arch)" ;;
331 hppa|sh) myconf="${myconf} -arch generic" ;; 278 hppa|sh) myconf+=" -arch generic" ;;
332 *) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;; 279 *) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
333 esac 280 esac
334 281
335 # 4.6: build qt-core with exceptions or qt-xmlpatterns won't build 282 # 4.6: build qt-core with exceptions or qt-xmlpatterns won't build
336 local exceptions= 283 local exceptions=
… …
343 *) 290 *)
344 [[ ${PN} == "qt-xmlpatterns" ]] || exceptions="-no-exceptions" 291 [[ ${PN} == "qt-xmlpatterns" ]] || exceptions="-no-exceptions"
345 ;; 292 ;;
346 esac 293 esac
347 294
348 myconf="${myconf} -platform $(qt_mkspecs_dir) -stl -verbose -largefile -confirm-license 295 myconf+=" -platform $(qt_mkspecs_dir) -stl -verbose -largefile -confirm-license
349 -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} 296 -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
350 -datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} 297 -datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR}
351 -plugindir ${QTPLUGINDIR} -sysconfdir ${QTSYSCONFDIR} 298 -plugindir ${QTPLUGINDIR} -sysconfdir ${QTSYSCONFDIR}
352 -translationdir ${QTTRANSDIR} -examplesdir ${QTEXAMPLESDIR} 299 -translationdir ${QTTRANSDIR} -examplesdir ${QTEXAMPLESDIR}
353 -demosdir ${QTDEMOSDIR} -silent -fast 300 -demosdir ${QTDEMOSDIR} -silent -fast -opensource
354 ${exceptions} 301 ${exceptions}
355 -reduce-relocations -nomake examples -nomake demos" 302 -reduce-relocations -nomake examples -nomake demos"
356 303
357 # Make eclass >= 4.5.x ready
358 case "${MY_PV}" in
359 4.5.* | 4.6.* )
360 myconf="${myconf} -opensource"
361 ;;
362 esac
363
364 echo "${myconf}" 304 echo "${myconf}"
365} 305}
366 306
367# @FUNCTION: build_directories 307# @FUNCTION: build_directories
368# @USAGE: < directories > 308# @USAGE: < directories >
369# @DESCRIPTION: 309# @DESCRIPTION:
370# Compiles the code in $QT4_TARGET_DIRECTORIES 310# Compiles the code in $QT4_TARGET_DIRECTORIES
371build_directories() { 311build_directories() {
372 local dirs="$@"
373 for x in ${dirs}; do 312 for x in "$@"; do
374 cd "${S}"/${x} 313 cd "${S}"/${x}
375 sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:/usr/$(get_libdir)/qt4:g" $(find "${S}" -name '*.pr[io]') "${S}"/mkspecs/common/linux.conf || die 314 sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:/usr/$(get_libdir)/qt4:g" $(find "${S}" -name '*.pr[io]') "${S}"/mkspecs/common/linux.conf || die
376 "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed" 315 "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
377 emake CC="@echo compiling \$< && $(tc-getCC)" \ 316 emake CC="@echo compiling \$< && $(tc-getCC)" \
378 CXX="@echo compiling \$< && $(tc-getCXX)" \ 317 CXX="@echo compiling \$< && $(tc-getCXX)" \
… …
383# @FUNCTION: install_directories 322# @FUNCTION: install_directories
384# @USAGE: < directories > 323# @USAGE: < directories >
385# @DESCRIPTION: 324# @DESCRIPTION:
386# run emake install in the given directories, which are separated by spaces 325# run emake install in the given directories, which are separated by spaces
387install_directories() { 326install_directories() {
388 local dirs="$@"
389 for x in ${dirs}; do 327 for x in "$@"; do
390 pushd "${S}"/${x} >/dev/null || die "Can't pushd ${S}/${x}" 328 pushd "${S}"/${x} >/dev/null || die "Can't pushd ${S}/${x}"
391 emake INSTALL_ROOT="${D}" install || die "emake install failed" 329 emake INSTALL_ROOT="${D}" install || die "emake install failed"
392 popd >/dev/null || die "Can't popd from ${S}/${x}" 330 popd >/dev/null || die "Can't popd from ${S}/${x}"
393 done 331 done
394} 332}
395 333
396# @ECLASS-VARIABLE: QCONFIG_ADD 334# @ECLASS-VARIABLE: QCONFIG_ADD
397# @DESCRIPTION: 335# @DESCRIPTION:
398# List options that need to be added to QT_CONFIG in qconfig.pri 336# List options that need to be added to QT_CONFIG in qconfig.pri
399QCONFIG_ADD="${QCONFIG_ADD:-}" 337: ${QCONFIG_ADD:=}
400 338
401# @ECLASS-VARIABLE: QCONFIG_REMOVE 339# @ECLASS-VARIABLE: QCONFIG_REMOVE
402# @DESCRIPTION: 340# @DESCRIPTION:
403# List options that need to be removed from QT_CONFIG in qconfig.pri 341# List options that need to be removed from QT_CONFIG in qconfig.pri
404QCONFIG_REMOVE="${QCONFIG_REMOVE:-}" 342: ${QCONFIG_REMOVE:=}
405 343
406# @ECLASS-VARIABLE: QCONFIG_DEFINE 344# @ECLASS-VARIABLE: QCONFIG_DEFINE
407# @DESCRIPTION: 345# @DESCRIPTION:
408# List variables that should be defined at the top of QtCore/qconfig.h 346# List variables that should be defined at the top of QtCore/qconfig.h
409QCONFIG_DEFINE="${QCONFIG_DEFINE:-}" 347: ${QCONFIG_DEFINE:=}
410 348
411# @FUNCTION: install_qconfigs 349# @FUNCTION: install_qconfigs
412# @DESCRIPTION: Install gentoo-specific mkspecs configurations 350# @DESCRIPTION: Install gentoo-specific mkspecs configurations
413install_qconfigs() { 351install_qconfigs() {
414 local x 352 local x
… …
434generate_qconfigs() { 372generate_qconfigs() {
435 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then 373 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then
436 local x qconfig_add qconfig_remove qconfig_new 374 local x qconfig_add qconfig_remove qconfig_new
437 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do 375 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
438 [[ -f ${x} ]] || continue 376 [[ -f ${x} ]] || continue
439 qconfig_add="${qconfig_add} $(sed -n 's/^QCONFIG_ADD=//p' "${x}")" 377 qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")"
440 qconfig_remove="${qconfig_remove} $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")" 378 qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
441 done 379 done
442 380
443 # these error checks do not use die because dying in pkg_post{inst,rm} 381 # these error checks do not use die because dying in pkg_post{inst,rm}
444 # just makes things worse. 382 # just makes things worse.
445 if [[ -e "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri ]]; then 383 if [[ -e "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri ]]; then
… …
452 390
453 # generate list of QT_CONFIG entries from the existing list 391 # generate list of QT_CONFIG entries from the existing list
454 # including qconfig_add and excluding qconfig_remove 392 # including qconfig_add and excluding qconfig_remove
455 for x in $(sed -n 's/^QT_CONFIG +=//p' \ 393 for x in $(sed -n 's/^QT_CONFIG +=//p' \
456 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do 394 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do
457 hasq ${x} ${qconfig_remove} || qconfig_new="${qconfig_new} ${x}" 395 hasq ${x} ${qconfig_remove} || qconfig_new+=" ${x}"
458 done 396 done
459 397
460 # replace the existing QT_CONFIG list with qconfig_new 398 # replace the existing QT_CONFIG list with qconfig_new
461 if ! sed -i -e "s/QT_CONFIG +=.*/QT_CONFIG += ${qconfig_new}/" \ 399 if ! sed -i -e "s/QT_CONFIG +=.*/QT_CONFIG += ${qconfig_new}/" \
462 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then 400 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then
… …
558 # pkgconfig files refer to WORKDIR/bin as the moc and uic locations. Fix: 496 # pkgconfig files refer to WORKDIR/bin as the moc and uic locations. Fix:
559 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do 497 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do
560 if [[ -e ${libfile} ]]; then 498 if [[ -e ${libfile} ]]; then
561 sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "Sed failed" 499 sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "Sed failed"
562 500
563 # Move .pc files into the pkgconfig directory 501 # Move .pc files into the pkgconfig directory
564 dodir ${QTPCDIR} 502 dodir ${QTPCDIR}
565 mv ${libfile} "${D}"/${QTPCDIR}/ \ 503 mv ${libfile} "${D}"/${QTPCDIR}/ \
566 || die "Moving ${libfile} to ${D}/${QTPCDIR}/ failed." 504 || die "Moving ${libfile} to ${D}/${QTPCDIR}/ failed."
567 fi 505 fi
568 done 506 done
… …
577# This will echo "${enableval}-${feature}" if <flag> is enabled, or 515# This will echo "${enableval}-${feature}" if <flag> is enabled, or
578# "-no-${feature} if the flag is disabled. If [feature] is not specified <flag> 516# "-no-${feature} if the flag is disabled. If [feature] is not specified <flag>
579# will be used for that. If [enableval] is not specified, it omits the 517# will be used for that. If [enableval] is not specified, it omits the
580# assignment-part 518# assignment-part
581qt_use() { 519qt_use() {
582 local flag="${1}" 520 local flag=$1
583 local feature="${1}" 521 local feature=$1
584 local enableval= 522 local enableval=
585 523
586 [[ -n ${2} ]] && feature=${2} 524 [[ -n $2 ]] && feature=$2
587 [[ -n ${3} ]] && enableval="-${3}" 525 [[ -n $3 ]] && enableval=-$3
588 526
589 if use ${flag}; then 527 if use ${flag}; then
590 echo "${enableval}-${feature}" 528 echo "${enableval}-${feature}"
591 else 529 else
592 echo "-no-${feature}" 530 echo "-no-${feature}"
593 fi 531 fi
594} 532}
595 533
596# @ECLASS-VARIABLE: QT4_BUILT_WITH_USE_CHECK
597# @DESCRIPTION:
598# The contents of $QT4_BUILT_WITH_USE_CHECK gets fed to built_with_use
599# (eutils.eclass), line per line.
600#
601# Example:
602# @CODE
603# pkg_setup() {
604# use qt3support && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK}
605# ~x11-libs/qt-gui-${PV} qt3support"
606# qt4-build_check_use
607# }
608# @CODE
609
610# Run built_with_use on each flag and print appropriate error messages if any
611# flags are missing
612
613_qt_built_with_use() {
614 local missing opt pkg flag flags
615
616 if [[ ${1} = "--missing" ]]; then
617 missing="${1} ${2}" && shift 2
618 fi
619 if [[ ${1:0:1} = "-" ]]; then
620 opt=${1} && shift
621 fi
622
623 pkg=${1} && shift
624
625 for flag in "${@}"; do
626 flags="${flags} ${flag}"
627 if ! built_with_use ${missing} ${opt} ${pkg} ${flag}; then
628 flags="${flags}*"
629 else
630 [[ ${opt} = "-o" ]] && return 0
631 fi
632 done
633 if [[ "${flags# }" = "${@}" ]]; then
634 return 0
635 fi
636 if [[ ${opt} = "-o" ]]; then
637 eerror "This package requires '${pkg}' to be built with any of the following USE flags: '$*'."
638 else
639 eerror "This package requires '${pkg}' to be built with the following USE flags: '${flags# }'."
640 fi
641 return 1
642}
643
644# @FUNCTION: qt4-build_check_use
645# @DESCRIPTION:
646# Check if the listed packages in $QT4_BUILT_WITH_USE_CHECK are built with the
647# USE flags listed.
648#
649# If any of the required USE flags are missing, an eerror will be printed for
650# each package with missing USE flags.
651qt4-build_check_use() {
652 local line missing
653 while read line; do
654 [[ -z ${line} ]] && continue
655 if ! _qt_built_with_use ${line}; then
656 missing=true
657 fi
658 done <<< "${QT4_BUILT_WITH_USE_CHECK}"
659 if [[ -n ${missing} ]]; then
660 echo
661 eerror "Flags marked with an * are missing."
662 die "Missing USE flags found"
663 fi
664}
665
666# @FUNCTION: qt_mkspecs_dir 534# @FUNCTION: qt_mkspecs_dir
667# @RETURN: the specs-directory w/o path 535# @RETURN: the specs-directory w/o path
668# @DESCRIPTION: 536# @DESCRIPTION:
669# Allows us to define which mkspecs dir we want to use. 537# Allows us to define which mkspecs dir we want to use.
670qt_mkspecs_dir() { 538qt_mkspecs_dir() {
671 # Allows us to define which mkspecs dir we want to use. 539 # Allows us to define which mkspecs dir we want to use.
672 local spec 540 local spec
673 541
674 case ${CHOST} in 542 case ${CHOST} in
675 *-freebsd*|*-dragonfly*) 543 *-freebsd*|*-dragonfly*)
676 spec="freebsd" ;; 544 spec=freebsd ;;
677 *-openbsd*) 545 *-openbsd*)
678 spec="openbsd" ;; 546 spec=openbsd ;;
679 *-netbsd*) 547 *-netbsd*)
680 spec="netbsd" ;; 548 spec=netbsd ;;
681 *-darwin*) 549 *-darwin*)
682 spec="darwin" ;; 550 spec=darwin ;;
683 *-linux-*|*-linux) 551 *-linux-*|*-linux)
684 spec="linux" ;; 552 spec=linux ;;
685 *) 553 *)
686 die "Unknown CHOST, no platform choosen." 554 die "Unknown CHOST, no platform choosen."
687 esac 555 esac
688 556
689 CXX=$(tc-getCXX) 557 CXX=$(tc-getCXX)
690 if [[ ${CXX/g++/} != ${CXX} ]]; then 558 if [[ ${CXX} == *g++* ]]; then
691 spec="${spec}-g++" 559 spec+=-g++
692 elif [[ ${CXX/icpc/} != ${CXX} ]]; then 560 elif [[ ${CXX} == *icpc* ]]; then
693 spec="${spec}-icc" 561 spec+=-icc
694 else 562 else
695 die "Unknown compiler ${CXX}." 563 die "Unknown compiler ${CXX}."
696 fi 564 fi
697 if [[ -n "${LIBDIR/lib}" ]]; then 565 if [[ -n ${LIBDIR/lib} ]]; then
698 spec="${spec}-${LIBDIR/lib}" 566 spec+=-${LIBDIR/lib}
699 fi 567 fi
700 568
701 echo "${spec}" 569 echo "${spec}"
702} 570}
703 571
704case ${EAPI:-0} in
705 0|1) EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postrm pkg_postinst ;;
706 2) EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install pkg_postrm pkg_postinst ;; 572EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install pkg_postrm pkg_postinst
707esac
Legend:
Removed from v.1.54  
changed lines
  Added in v.1.56
  ViewVC Help
Powered by ViewVC 1.1.20