/[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.122 Revision 1.128
1# Copyright 1999-2012 Gentoo Foundation 1# Copyright 1999-2012 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.122 2012/03/01 15:19:14 pesa Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.128 2012/05/07 21:28:01 pesa Exp $
4 4
5# @ECLASS: qt4-build.eclass 5# @ECLASS: qt4-build.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Qt herd <qt@gentoo.org> 7# Qt herd <qt@gentoo.org>
8# @BLURB: Eclass for Qt4 split ebuilds. 8# @BLURB: Eclass for Qt4 split ebuilds.
9# @DESCRIPTION: 9# @DESCRIPTION:
10# This eclass contains various functions that are used when building Qt4. 10# This eclass contains various functions that are used when building Qt4.
11 11
12case ${EAPI} in
13 2|3|4) : ;;
14 *) die "qt4-build.eclass requires EAPI 2, 3 or 4." ;;
15esac
16
12inherit base eutils multilib toolchain-funcs flag-o-matic versionator 17inherit base eutils flag-o-matic multilib toolchain-funcs versionator
18
19if [[ ${PV} == *9999* ]]; then
20 QT4_BUILD_TYPE="live"
21 inherit git-2
22else
23 QT4_BUILD_TYPE="release"
24fi
25
26HOMEPAGE="http://qt-project.org/ http://qt.nokia.com/"
27LICENSE="|| ( LGPL-2.1 GPL-3 )"
13 28
14MY_PV=${PV/_/-} 29MY_PV=${PV/_/-}
15MY_P=qt-everywhere-opensource-src-${MY_PV} 30MY_P=qt-everywhere-opensource-src-${MY_PV}
16 31
17HOMEPAGE="http://qt.nokia.com/ http://qt-project.org/" 32case ${QT4_BUILD_TYPE} in
33 live)
34 EGIT_REPO_URI="git://gitorious.org/qt/qt.git
35 https://git.gitorious.org/qt/qt.git"
36 EGIT_BRANCH="${PV%.9999}"
37 ;;
38 release)
18SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz" 39 SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
19LICENSE="|| ( LGPL-2.1 GPL-3 )" 40 ;;
41esac
20 42
21IUSE="aqua debug pch" 43IUSE="aqua debug pch"
22
23[[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] && 44if [[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]]; then
24[[ ${CATEGORY}/${PN} != x11-themes/qgtkstyle ]] &&
25 IUSE+=" +exceptions" 45 IUSE+=" +exceptions"
26 46fi
27if version_is_at_least 4.7.99999999; then 47if version_is_at_least 4.8; then
28 IUSE+=" c++0x qpa" 48 IUSE+=" c++0x qpa"
29fi 49fi
30 50
31DEPEND="dev-util/pkgconfig" 51DEPEND="virtual/pkgconfig"
52if [[ ${QT4_BUILD_TYPE} == live ]]; then
53 DEPEND+=" dev-lang/perl"
54fi
55
32RDEPEND=" 56RDEPEND="
33 !<x11-libs/qt-assistant-${PV} 57 !<x11-libs/qt-assistant-${PV}
34 !>x11-libs/qt-assistant-${PV}-r9999 58 !>x11-libs/qt-assistant-${PV}-r9999
59 !<x11-libs/qt-bearer-${PV}
60 !>x11-libs/qt-bearer-${PV}-r9999
35 !<x11-libs/qt-core-${PV} 61 !<x11-libs/qt-core-${PV}
36 !>x11-libs/qt-core-${PV}-r9999 62 !>x11-libs/qt-core-${PV}-r9999
37 !<x11-libs/qt-dbus-${PV} 63 !<x11-libs/qt-dbus-${PV}
38 !>x11-libs/qt-dbus-${PV}-r9999 64 !>x11-libs/qt-dbus-${PV}-r9999
39 !<x11-libs/qt-declarative-${PV} 65 !<x11-libs/qt-declarative-${PV}
76 102
77 # Protect users by not allowing downgrades between releases 103 # Protect users by not allowing downgrades between releases
78 # Downgrading revisions within the same release should be allowed 104 # Downgrading revisions within the same release should be allowed
79 if has_version '>'${CATEGORY}/${P}-r9999; then 105 if has_version '>'${CATEGORY}/${P}-r9999; then
80 if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then 106 if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
107 eerror
81 eerror "Sanity check to keep you from breaking your system:" 108 eerror "Sanity check to keep you from breaking your system:"
82 eerror " Downgrading Qt is completely unsupported and will break your system!" 109 eerror " Downgrading Qt is completely unsupported and will break your system!"
110 eerror
83 die "aborting to save your system" 111 die "aborting to save your system"
84 else 112 else
85 ewarn "Downgrading Qt is completely unsupported and will break your system!" 113 ewarn "Downgrading Qt is completely unsupported and will break your system!"
86 fi 114 fi
87 fi 115 fi
88 116
89 if [[ ${PN} == "qt-webkit" ]]; then 117 if [[ ${PN} == qt-webkit ]]; then
90 eshopts_push -s extglob 118 eshopts_push -s extglob
91 if is-flagq '-g?(gdb)?([1-9])'; then 119 if is-flagq '-g?(gdb)?([1-9])'; then
92 echo 120 echo
93 ewarn "You have enabled debug info (probably have -g or -ggdb in your \$C{,XX}FLAGS)." 121 ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
94 ewarn "You may experience really long compilation times and/or increased memory usage." 122 ewarn "You may experience really long compilation times and/or increased memory usage."
95 ewarn "If compilation fails, please try removing -g{,gdb} before reporting a bug." 123 ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
96 ewarn "For more info check out bug #307861" 124 ewarn "For more info check out bug #307861"
97 echo 125 echo
98 fi 126 fi
99 eshopts_pop 127 eshopts_pop
100 fi 128 fi
110 [[ ${CHOST} == *-apple-darwin* ]] && \ 138 [[ ${CHOST} == *-apple-darwin* ]] && \
111 QT4_EXTRACT_DIRECTORIES="src/gui/kernel/qapplication_mac.mm 139 QT4_EXTRACT_DIRECTORIES="src/gui/kernel/qapplication_mac.mm
112 ${QT4_EXTRACT_DIRECTORIES}" 140 ${QT4_EXTRACT_DIRECTORIES}"
113 fi 141 fi
114 142
115 # Make sure ebuilds use the required EAPI
116 if [[ ${EAPI} != [234] ]]; then
117 eerror "The qt4-build eclass requires EAPI 2,3 or 4 but this ebuild is using"
118 eerror "EAPI=${EAPI:-0}. The ebuild author or editor failed. This ebuild needs to be"
119 eerror "fixed. Using qt4-build eclass without EAPI 2,3 or 4 will fail."
120 die "qt4-build eclass requires EAPI 2,3 or 4"
121 fi
122
123 if ! version_is_at_least 4.1 $(gcc-version); then 143 if ! version_is_at_least 4.1 $(gcc-version); then
124 ewarn "Using a GCC version lower than 4.1 is not supported!" 144 ewarn "Using a GCC version lower than 4.1 is not supported."
125 fi 145 fi
126} 146}
127 147
128# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES 148# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
129# @DESCRIPTION: 149# @DESCRIPTION:
139# @DESCRIPTION: 159# @DESCRIPTION:
140# Unpacks the sources. 160# Unpacks the sources.
141qt4-build_src_unpack() { 161qt4-build_src_unpack() {
142 setqtenv 162 setqtenv
143 163
164 case ${QT4_BUILD_TYPE} in
165 live)
166 git-2_src_unpack
167 ;;
168 release)
144 local tarball="${MY_P}.tar.gz" target= targets= 169 local tarball="${MY_P}.tar.gz" target= targets=
145 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \ 170 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
146 src/{qbase,qt_targets,qt_install}.pri bin config.tests \ 171 src/{qbase,qt_targets,qt_install}.pri bin config.tests \
147 mkspecs qmake ${QT4_EXTRACT_DIRECTORIES} 172 mkspecs qmake ${QT4_EXTRACT_DIRECTORIES}
148 do 173 do
149 targets+="${MY_P}/${target} " 174 targets+="${MY_P}/${target} "
150 done 175 done
151 176
152 ebegin "Unpacking parts of ${tarball}:" ${targets//${MY_P}\/} 177 ebegin "Unpacking parts of ${tarball}:" ${targets//${MY_P}\/}
153 tar -xzf "${DISTDIR}/${tarball}" ${targets} 178 tar -xzf "${DISTDIR}/${tarball}" ${targets}
154 eend $? || die "failed to unpack" 179 eend $? || die "failed to unpack"
180 ;;
181 esac
155} 182}
156 183
157# @ECLASS-VARIABLE: PATCHES 184# @ECLASS-VARIABLE: PATCHES
158# @DEFAULT_UNSET 185# @DEFAULT_UNSET
159# @DESCRIPTION: 186# @DESCRIPTION:
171# @DESCRIPTION: 198# @DESCRIPTION:
172# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix 199# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
173# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in /etc/make.conf. 200# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in /etc/make.conf.
174qt4-build_src_prepare() { 201qt4-build_src_prepare() {
175 setqtenv 202 setqtenv
176 cd "${S}"
177 203
204 if [[ ${QT4_BUILD_TYPE} == live ]]; then
205 QTDIR="." ./bin/syncqt || die "syncqt failed"
206 fi
207
178 if version_is_at_least "4.7"; then 208 if version_is_at_least 4.7; then
179 # fix libX11 dependency on non X packages 209 # fix libX11 dependency on non X packages
180 local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns" 210 local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"
181 has ${PN} ${nolibx11_pkgs} && qt_nolibx11 211 has ${PN} ${nolibx11_pkgs} && qt_nolibx11
182 212
183 qt_assistant_cleanup 213 qt_assistant_cleanup
197 skip_project_generation 227 skip_project_generation
198 symlink_binaries_to_buildtree 228 symlink_binaries_to_buildtree
199 fi 229 fi
200 230
201 if [[ ${CHOST} == *86*-apple-darwin* ]]; then 231 if [[ ${CHOST} == *86*-apple-darwin* ]]; then
202 # qmake bus errors with -O2 but -O3 works 232 # qmake bus errors with -O2 or -O3 but -O1 works
233 # Bug 373061
203 replace-flags -O2 -O3 234 replace-flags -O[23] -O1
204 fi 235 fi
205 236
206 # Bug 178652 237 # Bug 178652
207 if [[ $(gcc-major-version) == 3 ]] && use amd64; then 238 if [[ $(gcc-major-version) == 3 ]] && use amd64; then
208 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS" 239 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
209 append-flags -fno-gcse 240 append-flags -fno-gcse
210 fi 241 fi
211 242
212 if use_if_iuse c++0x; then 243 if use_if_iuse c++0x; then
244 echo
213 ewarn "You are about to build Qt4 using the C++11 standard. Even though" 245 ewarn "You are about to build Qt4 using the C++11 standard. Even though"
214 ewarn "this is an official standard, some of the reverse dependencies" 246 ewarn "this is an official standard, some of the reverse dependencies"
215 ewarn "may fail to compile or link againt the Qt4 libraries. Before" 247 ewarn "may fail to compile or link againt the Qt4 libraries. Before"
216 ewarn "reporting a bug, make sure your bug is reproducible with c++0x" 248 ewarn "reporting a bug, make sure your bug is reproducible with c++0x"
217 ewarn "disabled." 249 ewarn "disabled."
250 echo
218 append-flags -std=c++0x 251 append-flags -std=c++0x
219 fi 252 fi
220 253
221 # Unsupported old gcc versions - hardened needs this :( 254 # Unsupported old gcc versions - hardened needs this :(
222 if [[ $(gcc-major-version) -lt 4 ]]; then 255 if [[ $(gcc-major-version) -lt 4 ]]; then
248 sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \ 281 sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \
249 'QMAKE_CC=$(tc-getCC)' 'QMAKE_CXX=$(tc-getCXX)' 'QMAKE_LINK=$(tc-getCXX)' \ 282 'QMAKE_CC=$(tc-getCC)' 'QMAKE_CXX=$(tc-getCXX)' 'QMAKE_LINK=$(tc-getCXX)' \
250 'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \ 283 'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
251 || die "sed config.tests failed" 284 || die "sed config.tests failed"
252 285
286 if ! version_is_at_least 4.8; then
253 # Strip predefined CFLAGS from mkspecs (bug 312689) 287 # Strip predefined CFLAGS from mkspecs (bugs 312689 and 352778)
254 sed -i -e '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf || die 288 sed -i -e '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf || die
289 fi
255 290
256 # Bug 172219 291 # Bug 172219
257 sed -e 's:/X11R6/:/:' -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die 292 sed -e 's:/X11R6/:/:' -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
258 293
259 if [[ ${CHOST} == *-darwin* ]]; then 294 if [[ ${CHOST} == *-darwin* ]]; then
260 # Set FLAGS *and* remove -arch, since our gcc-apple is multilib 295 # Set FLAGS *and* remove -arch, since our gcc-apple is multilib
261 # crippled (by design) :/ 296 # crippled (by design) :/
297 local mac_gpp_conf=
298 if [[ -f mkspecs/common/mac-g++.conf ]]; then
299 # qt < 4.8 has mac-g++.conf
300 mac_gpp_conf="mkspecs/common/mac-g++.conf"
301 elif [[ -f mkspecs/common/g++-macx.conf ]]; then
302 # qt >= 4.8 has g++-macx.conf
303 mac_gpp_conf="mkspecs/common/g++-macx.conf"
304 else
305 die "no known conf file for mac found"
306 fi
262 sed \ 307 sed \
263 -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ 308 -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
264 -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ 309 -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
265 -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=-headerpad_max_install_names ${LDFLAGS}:" \ 310 -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=-headerpad_max_install_names ${LDFLAGS}:" \
266 -e "s:-arch\s\w*::g" \ 311 -e "s:-arch\s\w*::g" \
267 -i mkspecs/common/mac-g++.conf \ 312 -i ${mac_gpp_conf} \
268 || die "sed mkspecs/common/mac-g++.conf failed" 313 || die "sed ${mac_gpp_conf} failed"
269 314
270 # Fix configure's -arch settings that appear in qmake/Makefile and also 315 # Fix configure's -arch settings that appear in qmake/Makefile and also
271 # fix arch handling (automagically duplicates our -arch arg and breaks 316 # fix arch handling (automagically duplicates our -arch arg and breaks
272 # pch). Additionally disable Xarch support. 317 # pch). Additionally disable Xarch support.
318 local mac_gcc_confs="${mac_gpp_conf}"
319 if [[ -f mkspecs/common/gcc-base-macx.conf ]]; then
320 mac_gcc_confs+=" mkspecs/common/gcc-base-macx.conf"
321 fi
273 sed \ 322 sed \
274 -e "s:-arch i386::" \ 323 -e "s:-arch i386::" \
275 -e "s:-arch ppc::" \ 324 -e "s:-arch ppc::" \
276 -e "s:-arch x86_64::" \ 325 -e "s:-arch x86_64::" \
277 -e "s:-arch ppc64::" \ 326 -e "s:-arch ppc64::" \
278 -e "s:-arch \$i::" \ 327 -e "s:-arch \$i::" \
279 -e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \ 328 -e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \
280 -e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \ 329 -e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \
281 -e "s:-Xarch_x86_64::g" \ 330 -e "s:-Xarch_x86_64::g" \
282 -e "s:-Xarch_ppc64::g" \ 331 -e "s:-Xarch_ppc64::g" \
283 -i configure mkspecs/common/mac-g++.conf \ 332 -i configure ${mac_gcc_confs} \
284 || die "sed -arch/-Xarch failed" 333 || die "sed -arch/-Xarch failed"
285 334
286 # On Snow Leopard don't fall back to 10.5 deployment target. 335 # On Snow Leopard don't fall back to 10.5 deployment target.
287 if [[ ${CHOST} == *-apple-darwin10 ]]; then 336 if [[ ${CHOST} == *-apple-darwin10 ]]; then
288 sed -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \ 337 sed -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \
289 -e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \ 338 -e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \
290 -i configure mkspecs/common/mac-g++.conf \ 339 -i configure ${mac_gpp_conf} \
291 || die "sed deployment target failed" 340 || die "sed deployment target failed"
292 fi 341 fi
293 fi 342 fi
294 343
295 # this one is needed for all systems with a separate -liconv, apart from 344 # this one is needed for all systems with a separate -liconv, apart from
389 conf+=" ${glibflags//-pthread}" 438 conf+=" ${glibflags//-pthread}"
390 unset glibflags 439 unset glibflags
391 fi 440 fi
392 441
393 if use_if_iuse qpa; then 442 if use_if_iuse qpa; then
394 ewarn 443 echo
395 ewarn "The qpa useflag enables the Qt Platform Abstraction, formely" 444 ewarn "The qpa useflag enables the Qt Platform Abstraction, formely"
396 ewarn "known as Qt Lighthouse. If you are not sure what that is, then" 445 ewarn "known as Qt Lighthouse. If you are not sure what that is, then"
397 ewarn "disable it before reporting any bugs related to this useflag." 446 ewarn "disable it before reporting any bugs related to this useflag."
398 ewarn 447 echo
399 conf+=" -qpa" 448 conf+=" -qpa"
400 fi 449 fi
401 450
402 if use aqua; then 451 if use aqua; then
403 # On (snow) leopard use the new (frameworked) cocoa code. 452 # On (snow) leopard use the new (frameworked) cocoa code.
442# @FUNCTION: qt4-build_src_test 491# @FUNCTION: qt4-build_src_test
443# @DESCRIPTION: 492# @DESCRIPTION:
444# Runs tests only in target directories. 493# Runs tests only in target directories.
445qt4-build_src_test() { 494qt4-build_src_test() {
446 # QtMultimedia does not have any test suite (bug #332299) 495 # QtMultimedia does not have any test suite (bug #332299)
447 [[ ${PN} == "qt-multimedia" ]] && return 496 [[ ${PN} == qt-multimedia ]] && return
448 497
449 for dir in ${QT4_TARGET_DIRECTORIES}; do 498 for dir in ${QT4_TARGET_DIRECTORIES}; do
450 emake -j1 check -C ${dir} 499 emake -j1 check -C ${dir}
451 done 500 done
452} 501}
455# @DESCRIPTION: 504# @DESCRIPTION:
456# For MacOS X we need to add some symlinks when frameworks are 505# For MacOS X we need to add some symlinks when frameworks are
457# being used, to avoid complications with some more or less stupid packages. 506# being used, to avoid complications with some more or less stupid packages.
458fix_includes() { 507fix_includes() {
459 if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then 508 if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
509 local frw dest f h rdir
460 # Some packages tend to include <Qt/...> 510 # Some packages tend to include <Qt/...>
461 dodir "${QTHEADERDIR#${EPREFIX}}"/Qt 511 dodir "${QTHEADERDIR#${EPREFIX}}"/Qt
462 512
463 # Fake normal headers when frameworks are installed... eases life later on 513 # Fake normal headers when frameworks are installed... eases life later
464 local dest f h 514 # on, make sure we use relative links though, as some ebuilds assume
515 # these dirs exist in src_install to add additional files
516 f=${QTHEADERDIR}
517 h=${QTLIBDIR}
518 while [[ -n ${f} && ${f%%/*} == ${h%%/*} ]] ; do
519 f=${f#*/}
520 h=${h#*/}
521 done
522 rdir=${h}
523 f="../"
524 while [[ ${h} == */* ]] ; do
525 f="${f}../"
526 h=${h#*/}
527 done
528 rdir="${f}${rdir}"
529
465 for frw in "${D}${QTLIBDIR}"/*.framework; do 530 for frw in "${D}${QTLIBDIR}"/*.framework; do
466 [[ -e "${frw}"/Headers ]] || continue 531 [[ -e "${frw}"/Headers ]] || continue
467 f=$(basename ${frw}) 532 f=$(basename ${frw})
468 dest="${QTHEADERDIR#${EPREFIX}}"/${f%.framework} 533 dest="${QTHEADERDIR#${EPREFIX}}"/${f%.framework}
469 dosym "${QTLIBDIR#${EPREFIX}}"/${f}/Headers "${dest}" 534 dosym "${rdir}"/${f}/Headers "${dest}"
470 535
471 # Link normal headers as well. 536 # Link normal headers as well.
472 for hdr in "${D}/${QTLIBDIR}/${f}"/Headers/*; do 537 for hdr in "${D}/${QTLIBDIR}/${f}"/Headers/*; do
473 h=$(basename ${hdr}) 538 h=$(basename ${hdr})
474 dosym "${QTLIBDIR#${EPREFIX}}"/${f}/Headers/${h} "${QTHEADERDIR#${EPREFIX}}"/Qt/${h} 539 dosym "../${rdir}"/${f}/Headers/${h} \
540 "${QTHEADERDIR#${EPREFIX}}"/Qt/${h}
475 done 541 done
476 done 542 done
477 fi 543 fi
478} 544}
479 545
610# @FUNCTION: generate_qconfigs 676# @FUNCTION: generate_qconfigs
611# @INTERNAL 677# @INTERNAL
612# @DESCRIPTION: 678# @DESCRIPTION:
613# Generates gentoo-specific qconfig.{h,pri}. 679# Generates gentoo-specific qconfig.{h,pri}.
614generate_qconfigs() { 680generate_qconfigs() {
615 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then 681 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${PN} == qt-core ]]; then
616 local x qconfig_add qconfig_remove qconfig_new 682 local x qconfig_add qconfig_remove qconfig_new
617 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do 683 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
618 [[ -f ${x} ]] || continue 684 [[ -f ${x} ]] || continue
619 qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")" 685 qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")"
620 qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")" 686 qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
806# Tries to clean up tools.pro for qt-assistant ebuilds. 872# Tries to clean up tools.pro for qt-assistant ebuilds.
807# Meant to be called in src_prepare(). 873# Meant to be called in src_prepare().
808# Since Qt 4.7.4 this function is a no-op. 874# Since Qt 4.7.4 this function is a no-op.
809qt_assistant_cleanup() { 875qt_assistant_cleanup() {
810 # apply patching to qt-assistant ebuilds only 876 # apply patching to qt-assistant ebuilds only
811 [[ ${PN} != "qt-assistant" ]] && return 877 [[ ${PN} != qt-assistant ]] && return
812 878
813 # no longer needed for 4.7.4 and later 879 # no longer needed for 4.7.4 and later
814 version_is_at_least "4.7.4" && return 880 version_is_at_least 4.7.4 && return
815 881
816 # different versions (and branches...) may need different handling, 882 # different versions (and branches...) may need different handling,
817 # add a case if you need special handling 883 # add a case if you need special handling
818 case "${MY_PV_EXTRA}" in 884 case "${MY_PV_EXTRA}" in
819 *kde-qt*) 885 *kde-qt*)

Legend:
Removed from v.1.122  
changed lines
  Added in v.1.128

  ViewVC Help
Powered by ViewVC 1.1.20