/[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.26 Revision 1.36
1# Copyright 2007-2009 Gentoo Foundation 1# Copyright 2007-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.26 2009/03/05 09:25:01 hwoarang Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.36 2009/05/29 14:48:00 hwoarang 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# This eclass contains various functions that are used when building Qt4 12# This eclass contains various functions that are used when building Qt4
13 13
14inherit eutils multilib toolchain-funcs flag-o-matic versionator 14inherit eutils multilib toolchain-funcs flag-o-matic versionator
15 15
16IUSE="${IUSE} custom-cxxflags debug pch" 16IUSE="${IUSE} custom-cxxflags debug pch"
17 17RDEPEND="
18 !<x11-libs/qt-assistant-${PV}
19 !>x11-libs/qt-assistant-${PV}-r9999
20 !<x11-libs/qt-core-${PV}
21 !>x11-libs/qt-core-${PV}-r9999
22 !<x11-libs/qt-dbus-${PV}
23 !>x11-libs/qt-dbus-${PV}-r9999
24 !<x11-libs/qt-demo-${PV}
25 !>x11-libs/qt-demo-${PV}-r9999
26 !<x11-libs/qt-gui-${PV}
27 !>x11-libs/qt-gui-${PV}-r9999
28 !<x11-libs/qt-opengl-${PV}
29 !>x11-libs/qt-opengl-${PV}-r9999
30 !<x11-libs/qt-phonon-${PV}
31 !>x11-libs/qt-phonon-${PV}-r9999
32 !<x11-libs/qt-qt3support-${PV}
33 !>x11-libs/qt-qt3support-${PV}-r9999
34 !<x11-libs/qt-script-${PV}
35 !>x11-libs/qt-script-${PV}-r9999
36 !<x11-libs/qt-sql-${PV}
37 !>x11-libs/qt-sql-${PV}-r9999
38 !<x11-libs/qt-svg-${PV}
39 !>x11-libs/qt-svg-${PV}-r9999
40 !<x11-libs/qt-test-${PV}
41 !>x11-libs/qt-test-${PV}-r9999
42 !<x11-libs/qt-webkit-${PV}
43 !>x11-libs/qt-webkit-${PV}-r9999
44 !<x11-libs/qt-xmlpatterns-${PV}
45 !>x11-libs/qt-xmlpatterns-${PV}-r9999
46"
18case "${PV}" in 47case "${PV}" in
19 4.?.?_rc*) 48 4.?.?_rc*)
20 SRCTYPE="${SRCTYPE:-opensource-src}" 49 SRCTYPE="${SRCTYPE:-opensource-src}"
21 MY_PV="${PV/_rc/-rc}" 50 MY_PV="${PV/_rc/-rc}"
22 ;; 51 ;;
38 67
39if version_is_at_least 4.5 ${PV} ; then 68if version_is_at_least 4.5 ${PV} ; then
40 LICENSE="|| ( LGPL-2.1 GPL-3 )" 69 LICENSE="|| ( LGPL-2.1 GPL-3 )"
41fi 70fi
42 71
72# @FUNCTION: qt4-build_pkg_setup
73# @DESCRIPTION:
74# Sets up installation directories, PLATFORM, PATH, and LD_LIBRARY_PATH
43qt4-build_pkg_setup() { 75qt4-build_pkg_setup() {
44 # EAPI=2 ebuilds set use-deps, others need this: 76 # EAPI=2 ebuilds set use-deps, others need this:
45 if [[ $EAPI != 2 ]]; then 77 if [[ $EAPI != 2 ]]; then
46 # Make sure debug setting corresponds with qt-core (bug 258512) 78 # Make sure debug setting corresponds with qt-core (bug 258512)
47 if [[ $PN != "qt-core" ]]; then 79 if [[ $PN != "qt-core" ]]; then
50 fi 82 fi
51 83
52 # Check USE requirements 84 # Check USE requirements
53 qt4-build_check_use 85 qt4-build_check_use
54 fi 86 fi
55
56 # Set up installation directories 87 # Set up installation directories
57 QTBASEDIR=/usr/$(get_libdir)/qt4 88 QTBASEDIR=/usr/$(get_libdir)/qt4
58 QTPREFIXDIR=/usr 89 QTPREFIXDIR=/usr
59 QTBINDIR=/usr/bin 90 QTBINDIR=/usr/bin
60 QTLIBDIR=/usr/$(get_libdir)/qt4 91 QTLIBDIR=/usr/$(get_libdir)/qt4
74 LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" 105 LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
75 106
76 if ! version_is_at_least 4.1 $(gcc-version) ; then 107 if ! version_is_at_least 4.1 $(gcc-version) ; then
77 ewarn "Using a GCC version lower than 4.1 is not supported!" 108 ewarn "Using a GCC version lower than 4.1 is not supported!"
78 echo 109 echo
79 ebeep 5 110 ebeep 3
80 fi 111 fi
81 112
82 if use custom-cxxflags; then 113 if use custom-cxxflags; then
83 echo 114 echo
84 ewarn "You have set USE=custom-cxxflags, which means Qt will be built with the" 115 ewarn "You have set USE=custom-cxxflags, which means Qt will be built with the"
89 echo 120 echo
90 fi 121 fi
91 122
92} 123}
93 124
125# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
126# @DESCRIPTION:
127# Arguments for build_target_directories. Takes the directories, in which the
128# code should be compiled. This is a space-separated list
129
130# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
131# @DESCRIPTION:
132# Space separated list including the directories that will be extracted from Qt
133# tarball
134
135# @FUNCTION: qt4-build_src_unpack
136# @DESCRIPTION:
137# Unpacks the sources
94qt4-build_src_unpack() { 138qt4-build_src_unpack() {
95 local target targets licenses 139 local target targets licenses
96 if version_is_at_least 4.5 ${PV} ; then 140 if version_is_at_least 4.5 ${PV} ; then
97 licenses="LICENSE.GPL3 LICENSE.LGPL" 141 licenses="LICENSE.GPL3 LICENSE.LGPL"
98 else 142 else
118 if [[ $EAPI != 2 ]]; then 162 if [[ $EAPI != 2 ]]; then
119 qt4-build_src_prepare 163 qt4-build_src_prepare
120 fi 164 fi
121} 165}
122 166
167
168# @FUNCTION: qt4-build_src_prepare
169# @DESCRIPTION:
170# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
171# source files in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified on /etc/make.conf.
123qt4-build_src_prepare() { 172qt4-build_src_prepare() {
124 cd "${S}" 173 cd "${S}"
125 174
126 if [[ ${PN} != qt-core ]]; then 175 if [[ ${PN} != qt-core ]]; then
127 skip_qmake_build_patch 176 skip_qmake_build_patch
133 # Don't let the user go too overboard with flags. 182 # Don't let the user go too overboard with flags.
134 strip-flags 183 strip-flags
135 replace-flags -O3 -O2 184 replace-flags -O3 -O2
136 fi 185 fi
137 186
138 # Bug 253127 187 # Bug 178652
188 if [[ "$(gcc-major-version)" == "3" ]] && use amd64; then
189 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
190 append-flags -fno-gcse
191 fi
192
139 # Unsupported old gcc versions - hardened needs this :( 193 # Unsupported old gcc versions - hardened needs this :(
140 if [[ $(gcc-major-version) -lt "4" ]] ; then 194 if [[ $(gcc-major-version) -lt "4" ]] ; then
141 ewarn "Appending -fno-stack-protector to CXXFLAGS" 195 ewarn "Appending -fno-stack-protector to CXXFLAGS"
142 append-cxxflags -fno-stack-protector 196 append-cxxflags -fno-stack-protector
143 fi 197 # Bug 253127
144 198 sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \
145 # Bug 178652 199 -i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed"
146 if [[ "$(gcc-major-version)" == "3" ]] && use amd64; then
147 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
148 append-flags -fno-gcse
149 fi 200 fi
150 201
151 # Bug 172219 202 # Bug 172219
152 sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ 203 sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
153 -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ 204 -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
160 -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ 211 -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
161 -i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed" 212 -i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed"
162 213
163} 214}
164 215
216# @FUNCTION: qt4-build_src_configure
217# @DESCRIPTION:
218# Default configure phase
165qt4-build_src_configure() { 219qt4-build_src_configure() {
166 220
167 myconf="$(standard_configure_options) ${myconf}" 221 myconf="$(standard_configure_options) ${myconf}"
168 222
169 echo ./configure ${myconf} 223 echo ./configure ${myconf}
170 ./configure ${myconf} || die "./configure failed" 224 ./configure ${myconf} || die "./configure failed"
171} 225}
172 226
227# @FUNCTION: qt4-build_src_compile
228# @DESCRIPTION: Actual compile phase
173qt4-build_src_compile() { 229qt4-build_src_compile() {
174 # Be backwards compatible for now 230 # Be backwards compatible for now
175 if [[ $EAPI != 2 ]]; then 231 if [[ $EAPI != 2 ]]; then
176 qt4-build_src_configure 232 qt4-build_src_configure
177 fi 233 fi
178 234
179 build_directories "${QT4_TARGET_DIRECTORIES}" 235 build_directories "${QT4_TARGET_DIRECTORIES}"
180} 236}
181 237
238# @FUNCTION: qt4-build_src_install
239# @DESCRIPTION:
240# Perform the actual installation including some library fixes.
182qt4-build_src_install() { 241qt4-build_src_install() {
183 install_directories "${QT4_TARGET_DIRECTORIES}" 242 install_directories "${QT4_TARGET_DIRECTORIES}"
184 install_qconfigs 243 install_qconfigs
185 fix_library_files 244 fix_library_files
186} 245}
187 246
247# @FUNCTION: standard_configure_options
248# @DESCRIPTION:
249# Sets up some standard configure options, like libdir (if necessary), whether
250# debug info is wanted or not.
188standard_configure_options() { 251standard_configure_options() {
189 local myconf="" 252 local myconf=""
190 253
191 [[ $(get_libdir) != "lib" ]] && myconf="${myconf} -L/usr/$(get_libdir)" 254 [[ $(get_libdir) != "lib" ]] && myconf="${myconf} -L/usr/$(get_libdir)"
192 255
207 else 270 else
208 myconf="${myconf} -release -no-separate-debug-info" 271 myconf="${myconf} -release -no-separate-debug-info"
209 fi 272 fi
210 273
211 # ARCH is set on Gentoo. Qt now falls back to generic on an unsupported 274 # ARCH is set on Gentoo. Qt now falls back to generic on an unsupported
212 # ${ARCH}. Therefore we convert it to supported values. 275 # $(tc-arch). Therefore we convert it to supported values.
213 case "${ARCH}" in 276 case "$(tc-arch)" in
214 amd64) myconf="${myconf} -arch x86_64" ;; 277 amd64) myconf="${myconf} -arch x86_64" ;;
215 ppc|ppc64) myconf="${myconf} -arch powerpc" ;; 278 ppc|ppc64) myconf="${myconf} -arch powerpc" ;;
216 x86|x86-*) myconf="${myconf} -arch i386" ;; 279 x86|x86-*) myconf="${myconf} -arch i386" ;;
217 alpha|arm|ia64|mips|s390|sparc) myconf="${myconf} -arch ${ARCH}" ;; 280 alpha|arm|ia64|mips|s390|sparc) myconf="${myconf} -arch $(tc-arch)" ;;
218 hppa|sh) myconf="${myconf} -arch generic" ;; 281 hppa|sh) myconf="${myconf} -arch generic" ;;
219 *) die "${ARCH} is unsupported by this eclass. Please file a bug." ;; 282 *) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
283 esac
284
285 # Bug 261412 Qt configure detects archs by uname
286 case "$(tc-arch)" in
287 ppc) myconf="${myconf} -platform linux-g++-32";;
220 esac 288 esac
221 289
222 myconf="${myconf} -stl -verbose -largefile -confirm-license -no-rpath 290 myconf="${myconf} -stl -verbose -largefile -confirm-license -no-rpath
223 -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} 291 -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
224 -datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} 292 -datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR}
225 -plugindir ${QTPLUGINDIR} -sysconfdir ${QTSYSCONFDIR} 293 -plugindir ${QTPLUGINDIR} -sysconfdir ${QTSYSCONFDIR}
226 -translationdir ${QTTRANSDIR} -examplesdir ${QTEXAMPLESDIR} 294 -translationdir ${QTTRANSDIR} -examplesdir ${QTEXAMPLESDIR}
227 -demosdir ${QTDEMOSDIR} -silent -fast 295 -demosdir ${QTDEMOSDIR} -silent -fast
228 $([[ ${PN} == qt-xmlpatterns ]] || echo -no-exceptions) 296 $([[ ${PN} == qt-xmlpatterns ]] || echo -no-exceptions)
229 $(use x86-fbsd || echo -reduce-relocations)
230 -nomake examples -nomake demos" 297 -reduce-relocations -nomake examples -nomake demos"
298
299 # Make eclass 4.5.{1,2} ready
300 case "${MY_PV}" in
301 4.5.1 | 4.5.2)
302 myconf="${myconf} -opensource"
303 ;;
304 esac
231 305
232 echo "${myconf}" 306 echo "${myconf}"
233} 307}
234 308
309# @FUNCTION: build_directories
310# @USAGE: < directories >
311# @DESCRIPTION:
312# Compiles the code in $QT4_TARGET_DIRECTORIES
235build_directories() { 313build_directories() {
236 local dirs="$@" 314 local dirs="$@"
237 for x in ${dirs}; do 315 for x in ${dirs}; do
238 cd "${S}"/${x} 316 cd "${S}"/${x}
239 "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed" 317 "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
240 emake || die "emake failed" 318 emake || die "emake failed"
241 done 319 done
242} 320}
243 321
322# @FUNCTION: install_directories
323# @USAGE: < directories >
324# @DESCRIPTION:
325# run emake install in the given directories, which are separated by spaces
244install_directories() { 326install_directories() {
245 local dirs="$@" 327 local dirs="$@"
246 for x in ${dirs}; do 328 for x in ${dirs}; do
247 pushd "${S}"/${x} >/dev/null || die "Can't pushd ${S}/${x}" 329 pushd "${S}"/${x} >/dev/null || die "Can't pushd ${S}/${x}"
248 emake INSTALL_ROOT="${D}" install || die "emake install failed" 330 emake INSTALL_ROOT="${D}" install || die "emake install failed"
263# @ECLASS-VARIABLE: QCONFIG_DEFINE 345# @ECLASS-VARIABLE: QCONFIG_DEFINE
264# @DESCRIPTION: 346# @DESCRIPTION:
265# List variables that should be defined at the top of QtCore/qconfig.h 347# List variables that should be defined at the top of QtCore/qconfig.h
266QCONFIG_DEFINE="${QCONFIG_DEFINE:-}" 348QCONFIG_DEFINE="${QCONFIG_DEFINE:-}"
267 349
350# @FUNCTION: install_qconfigs
351# @DESCRIPTION: Install gentoo-specific mkspecs configurations
268install_qconfigs() { 352install_qconfigs() {
269 local x 353 local x
270 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then 354 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
271 for x in QCONFIG_ADD QCONFIG_REMOVE; do 355 for x in QCONFIG_ADD QCONFIG_REMOVE; do
272 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri 356 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
282 insinto ${QTHEADERDIR}/Gentoo 366 insinto ${QTHEADERDIR}/Gentoo
283 doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed" 367 doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed"
284 fi 368 fi
285} 369}
286 370
371# @FUNCTION: generate_qconfigs
372# @DESCRIPTION: Generates gentoo-specific configurations
287generate_qconfigs() { 373generate_qconfigs() {
288 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then 374 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then
289 local x qconfig_add qconfig_remove qconfig_new 375 local x qconfig_add qconfig_remove qconfig_new
290 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do 376 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
291 [[ -f ${x} ]] || continue 377 [[ -f ${x} ]] || continue
338 "${ROOT}${QTHEADERDIR}" 2>/dev/null 424 "${ROOT}${QTHEADERDIR}" 2>/dev/null
339 fi 425 fi
340 fi 426 fi
341} 427}
342 428
429# @FUNCTION: qt4-build_pkg_postrm
430# @DESCRIPTION: Generate configurations when the package is completely removed
343qt4-build_pkg_postrm() { 431qt4-build_pkg_postrm() {
344 generate_qconfigs 432 generate_qconfigs
345} 433}
346 434
435# @FUNCTION: qt4-build_pkg_postinst
436# @DESCRIPTION: Generate configuration, plus throws a message about possible
437# breakages and proposed solutions.
347qt4-build_pkg_postinst() { 438qt4-build_pkg_postinst() {
348 generate_qconfigs 439 generate_qconfigs
349 echo 440 echo
350 ewarn "After a rebuild or upgrade of Qt, it can happen that Qt plugins (such as Qt" 441 ewarn "After a rebuild or upgrade of Qt, it can happen that Qt plugins (such as Qt"
351 ewarn "and KDE styles and widgets) can no longer be loaded. In this situation you" 442 ewarn "and KDE styles and widgets) can no longer be loaded. In this situation you"
360 ewarn 451 ewarn
361 ewarn "For more information, see http://doc.trolltech.com/4.4/plugins-howto.html" 452 ewarn "For more information, see http://doc.trolltech.com/4.4/plugins-howto.html"
362 echo 453 echo
363} 454}
364 455
456# @FUNCTION: skip_qmake_build_patch
457# @DESCRIPTION:
458# Don't need to build qmake, as it's already installed from qt-core
365skip_qmake_build_patch() { 459skip_qmake_build_patch() {
366 # Don't need to build qmake, as it's already installed from qt-core 460 # Don't need to build qmake, as it's already installed from qt-core
367 sed -i -e "s:if true:if false:g" "${S}"/configure || die "Sed failed" 461 sed -i -e "s:if true:if false:g" "${S}"/configure || die "Sed failed"
368} 462}
369 463
464# @FUNCTION: skip_project_generation_patch
465# @DESCRIPTION:
466# Exit the script early by throwing in an exit before all of the .pro files are scanned
370skip_project_generation_patch() { 467skip_project_generation_patch() {
371 # Exit the script early by throwing in an exit before all of the .pro files are scanned 468 # Exit the script early by throwing in an exit before all of the .pro files are scanned
372 sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \ 469 sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \
373 -i "${S}"/configure || die "Sed failed" 470 -i "${S}"/configure || die "Sed failed"
374} 471}
375 472
473# @FUNCTION: symlink_binaries_to_buildtree
474# @DESCRIPTION:
475# Symlink generated binaries to buildtree so they can be used during compilation
476# time
376symlink_binaries_to_buildtree() { 477symlink_binaries_to_buildtree() {
377 for bin in qmake moc uic rcc; do 478 for bin in qmake moc uic rcc; do
378 ln -s ${QTBINDIR}/${bin} "${S}"/bin/ || die "Symlinking ${bin} to ${S}/bin failed." 479 ln -s ${QTBINDIR}/${bin} "${S}"/bin/ || die "Symlinking ${bin} to ${S}/bin failed."
379 done 480 done
380} 481}
381 482
483# @FUNCTION: fix_library_files
484# @DESCRIPTION:
485# Fixes the pathes in *.la, *.prl, *.pc, as they are wrong due to sandbox and
486# moves the *.pc-files into the pkgconfig directory
382fix_library_files() { 487fix_library_files() {
383 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do 488 for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do
384 if [[ -e ${libfile} ]]; then 489 if [[ -e ${libfile} ]]; then
385 sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "Sed on ${libfile} failed." 490 sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "Sed on ${libfile} failed."
386 fi 491 fi
390 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do 495 for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do
391 if [[ -e ${libfile} ]]; then 496 if [[ -e ${libfile} ]]; then
392 sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "Sed failed" 497 sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "Sed failed"
393 498
394 # Move .pc files into the pkgconfig directory 499 # Move .pc files into the pkgconfig directory
395
396 dodir ${QTPCDIR} 500 dodir ${QTPCDIR}
397 mv ${libfile} "${D}"/${QTPCDIR}/ \ 501 mv ${libfile} "${D}"/${QTPCDIR}/ \
398 || die "Moving ${libfile} to ${D}/${QTPCDIR}/ failed." 502 || die "Moving ${libfile} to ${D}/${QTPCDIR}/ failed."
399 fi 503 fi
400 done 504 done
401 505
402 # Don't install an empty directory 506 # Don't install an empty directory
403 rmdir "${D}"/${QTLIBDIR}/pkgconfig 507 rmdir "${D}"/${QTLIBDIR}/pkgconfig
404} 508}
405 509
510# @FUNCTION: qt_use
511# @USAGE: < flag > [ feature ] [ enableval ]
512# @DESCRIPTION:
513# This will echo "${enableval}-${feature}" if <flag> is enabled, or
514# "-no-${feature} if the flag is disabled. If [feature] is not specified <flag>
515# will be used for that. If [enableval] is not specified, it omits the
516# assignment-part
406qt_use() { 517qt_use() {
407 local flag="${1}" 518 local flag="${1}"
408 local feature="${1}" 519 local feature="${1}"
409 local enableval= 520 local enableval=
410 521
432# } 543# }
433# @CODE 544# @CODE
434 545
435# Run built_with_use on each flag and print appropriate error messages if any 546# Run built_with_use on each flag and print appropriate error messages if any
436# flags are missing 547# flags are missing
548
437_qt_built_with_use() { 549_qt_built_with_use() {
438 local missing opt pkg flag flags 550 local missing opt pkg flag flags
439 551
440 if [[ ${1} = "--missing" ]]; then 552 if [[ ${1} = "--missing" ]]; then
441 missing="${1} ${2}" && shift 2 553 missing="${1} ${2}" && shift 2
485 eerror "Flags marked with an * are missing." 597 eerror "Flags marked with an * are missing."
486 die "Missing USE flags found" 598 die "Missing USE flags found"
487 fi 599 fi
488} 600}
489 601
602# @FUNCTION: qt_mkspecs_dir
603# @RETURN: the specs-directory w/o path
604# @DESCRIPTION:
605# Allows us to define which mkspecs dir we want to use.
490qt_mkspecs_dir() { 606qt_mkspecs_dir() {
491 # Allows us to define which mkspecs dir we want to use. 607 # Allows us to define which mkspecs dir we want to use.
492 local spec 608 local spec
493 609
494 case ${CHOST} in 610 case ${CHOST} in

Legend:
Removed from v.1.26  
changed lines
  Added in v.1.36

  ViewVC Help
Powered by ViewVC 1.1.20