/[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.139 Revision 1.155
1# Copyright 1999-2012 Gentoo Foundation 1# Copyright 1999-2014 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.139 2012/11/12 09:28:53 pesa Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.155 2014/08/29 23:56:18 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 12case ${EAPI} in
13 3|4|5) : ;; 13 4|5) : ;;
14 *) die "qt4-build.eclass: unsupported EAPI=${EAPI:-0}" ;; 14 *) die "qt4-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
15esac 15esac
16 16
17inherit eutils flag-o-matic multilib toolchain-funcs versionator 17inherit eutils flag-o-matic multilib toolchain-funcs versionator
18 18
19if [[ ${PV} == *9999* ]]; then 19if [[ ${PV} == *9999* ]]; then
20 QT4_BUILD_TYPE="live" 20 QT4_BUILD_TYPE="live"
21 inherit git-2 21 inherit git-r3
22else 22else
23 QT4_BUILD_TYPE="release" 23 QT4_BUILD_TYPE="release"
24fi 24fi
25 25
26HOMEPAGE="http://qt-project.org/ http://qt.digia.com/" 26HOMEPAGE="http://qt-project.org/ http://qt.digia.com/"
27LICENSE="|| ( LGPL-2.1 GPL-3 )" 27LICENSE="|| ( LGPL-2.1 GPL-3 )"
28 28
29MY_PV=${PV/_/-}
30MY_P=qt-everywhere-opensource-src-${MY_PV}
31
32case ${QT4_BUILD_TYPE} in 29case ${QT4_BUILD_TYPE} in
33 live) 30 live)
31 EGIT_REPO_URI=(
34 EGIT_REPO_URI="git://gitorious.org/qt/qt.git 32 "git://gitorious.org/qt/qt.git"
35 https://git.gitorious.org/qt/qt.git" 33 "https://git.gitorious.org/qt/qt.git"
34 )
36 EGIT_BRANCH=${PV%.9999} 35 EGIT_BRANCH=${PV%.9999}
37 ;; 36 ;;
38 release) 37 release)
39 if version_is_at_least 4.8.1; then 38 MY_P=qt-everywhere-opensource-src-${PV/_/-}
40 SRC_URI="http://releases.qt-project.org/qt4/source/${MY_P}.tar.gz" 39 SRC_URI="http://download.qt-project.org/official_releases/qt/${PV%.*}/${PV}/${MY_P}.tar.gz"
41 else 40 S=${WORKDIR}/${MY_P}
42 SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
43 fi
44 ;; 41 ;;
45esac 42esac
46 43
47IUSE="aqua debug pch" 44IUSE="aqua debug pch"
48[[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] && IUSE+=" +exceptions"
49if version_is_at_least 4.8; then 45if ! version_is_at_least 4.8.5; then
50 [[ ${CATEGORY}/${PN} != x11-libs/qt-webkit ]] && IUSE+=" c++0x" 46 [[ ${CATEGORY}/${PN} != dev-qt/qtwebkit ]] && IUSE+=" c++0x"
51 version_is_at_least 4.8.3 || IUSE+=" qpa"
52fi 47fi
48[[ ${CATEGORY}/${PN} != dev-qt/qtxmlpatterns ]] && IUSE+=" +exceptions"
53 49
54DEPEND="virtual/pkgconfig" 50DEPEND="virtual/pkgconfig"
55if [[ ${QT4_BUILD_TYPE} == live ]]; then 51if [[ ${QT4_BUILD_TYPE} == live ]]; then
56 DEPEND+=" dev-lang/perl" 52 DEPEND+=" dev-lang/perl"
57fi 53fi
58 54
59RDEPEND="
60 !<x11-libs/qt-assistant-${PV}:4
61 !>x11-libs/qt-assistant-${PV}-r9999:4
62 !<x11-libs/qt-bearer-${PV}:4
63 !>x11-libs/qt-bearer-${PV}-r9999:4
64 !<x11-libs/qt-core-${PV}:4
65 !>x11-libs/qt-core-${PV}-r9999:4
66 !<x11-libs/qt-dbus-${PV}:4
67 !>x11-libs/qt-dbus-${PV}-r9999:4
68 !<x11-libs/qt-declarative-${PV}:4
69 !>x11-libs/qt-declarative-${PV}-r9999:4
70 !<x11-libs/qt-demo-${PV}:4
71 !>x11-libs/qt-demo-${PV}-r9999:4
72 !<x11-libs/qt-gui-${PV}:4
73 !>x11-libs/qt-gui-${PV}-r9999:4
74 !<x11-libs/qt-multimedia-${PV}:4
75 !>x11-libs/qt-multimedia-${PV}-r9999:4
76 !<x11-libs/qt-opengl-${PV}:4
77 !>x11-libs/qt-opengl-${PV}-r9999:4
78 !<x11-libs/qt-openvg-${PV}:4
79 !>x11-libs/qt-openvg-${PV}-r9999:4
80 !<x11-libs/qt-phonon-${PV}:4
81 !>x11-libs/qt-phonon-${PV}-r9999:4
82 !<x11-libs/qt-qt3support-${PV}:4
83 !>x11-libs/qt-qt3support-${PV}-r9999:4
84 !<x11-libs/qt-script-${PV}:4
85 !>x11-libs/qt-script-${PV}-r9999:4
86 !<x11-libs/qt-sql-${PV}:4
87 !>x11-libs/qt-sql-${PV}-r9999:4
88 !<x11-libs/qt-svg-${PV}:4
89 !>x11-libs/qt-svg-${PV}-r9999:4
90 !<x11-libs/qt-test-${PV}:4
91 !>x11-libs/qt-test-${PV}-r9999:4
92 !<x11-libs/qt-webkit-${PV}:4
93 !>x11-libs/qt-webkit-${PV}-r9999:4
94 !<x11-libs/qt-xmlpatterns-${PV}:4
95 !>x11-libs/qt-xmlpatterns-${PV}-r9999:4
96"
97
98S=${WORKDIR}/${MY_P}
99
100# @FUNCTION: qt4-build_pkg_setup 55# @FUNCTION: qt4-build_pkg_setup
101# @DESCRIPTION: 56# @DESCRIPTION:
102# Sets up PATH and LD_LIBRARY_PATH. 57# Sets up PATH and LD_LIBRARY_PATH.
103qt4-build_pkg_setup() { 58qt4-build_pkg_setup() {
104 # Protect users by not allowing downgrades between releases. 59 # Warn users of possible breakage when downgrading to a previous release.
105 # Downgrading revisions within the same release should be allowed. 60 # Downgrading revisions within the same release is safe.
106 if has_version ">${CATEGORY}/${P}-r9999:4"; then 61 if has_version ">${CATEGORY}/${P}-r9999:4"; then
107 if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then 62 ewarn
108 eerror " *** Sanity check to keep you from breaking your system ***"
109 eerror "Downgrading Qt is completely unsupported and will break your system!"
110 die "aborting to save your system"
111 else
112 ewarn "Downgrading Qt is completely unsupported and will break your system!" 63 ewarn "Downgrading Qt is completely unsupported and can break your system!"
113 fi 64 ewarn
114 fi 65 fi
115 66
116 PATH="${S}/bin${PATH:+:}${PATH}" 67 PATH="${S}/bin${PATH:+:}${PATH}"
117 if [[ ${CHOST} != *-darwin* ]]; then 68 if [[ ${CHOST} != *-darwin* ]]; then
118 LD_LIBRARY_PATH="${S}/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}" 69 LD_LIBRARY_PATH="${S}/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
143# @DESCRIPTION: 94# @DESCRIPTION:
144# Unpacks the sources. 95# Unpacks the sources.
145qt4-build_src_unpack() { 96qt4-build_src_unpack() {
146 setqtenv 97 setqtenv
147 98
148 if ! version_is_at_least 4.1 $(gcc-version); then 99 if ! version_is_at_least 4.4 $(gcc-version); then
100 ewarn
149 ewarn "Using a GCC version lower than 4.1 is not supported." 101 ewarn "Using a GCC version lower than 4.4 is not supported."
102 ewarn
150 fi 103 fi
151 104
152 if [[ ${PN} == qt-webkit ]]; then 105 if [[ ${CATEGORY}/${PN} == dev-qt/qtwebkit ]]; then
153 eshopts_push -s extglob 106 eshopts_push -s extglob
154 if is-flagq '-g?(gdb)?([1-9])'; then 107 if is-flagq '-g?(gdb)?([1-9])'; then
155 echo 108 ewarn
156 ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)." 109 ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
157 ewarn "You may experience really long compilation times and/or increased memory usage." 110 ewarn "You may experience really long compilation times and/or increased memory usage."
158 ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug." 111 ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
159 ewarn "For more info check out https://bugs.gentoo.org/307861" 112 ewarn "For more info check out https://bugs.gentoo.org/307861"
160 echo 113 ewarn
161 fi 114 fi
162 eshopts_pop 115 eshopts_pop
163 fi 116 fi
164 117
165 case ${QT4_BUILD_TYPE} in 118 case ${QT4_BUILD_TYPE} in
166 live) 119 live)
167 git-2_src_unpack 120 git-r3_src_unpack
168 ;; 121 ;;
169 release) 122 release)
170 local tarball="${MY_P}.tar.gz" target= targets= 123 local tarball="${MY_P}.tar.gz" target= targets=
171 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \ 124 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
172 src/{qbase,qt_targets,qt_install}.pri bin config.tests \ 125 src/{qbase,qt_targets,qt_install}.pri bin config.tests \
196# @CODE 149# @CODE
197 150
198# @FUNCTION: qt4-build_src_prepare 151# @FUNCTION: qt4-build_src_prepare
199# @DESCRIPTION: 152# @DESCRIPTION:
200# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix 153# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
201# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in /etc/make.conf. 154# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in make.conf.
202qt4-build_src_prepare() { 155qt4-build_src_prepare() {
203 setqtenv 156 setqtenv
204 157
205 if [[ ${QT4_BUILD_TYPE} == live ]]; then 158 if [[ ${QT4_BUILD_TYPE} == live ]]; then
206 QTDIR="." ./bin/syncqt || die "syncqt failed" 159 QTDIR="." ./bin/syncqt || die "syncqt failed"
207 fi 160 fi
208 161
209 # avoid X11 dependency in non-gui packages 162 # avoid X11 dependency in non-gui packages
210 local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns" 163 local nolibx11_pkgs="qtbearer qtcore qtdbus qtscript qtsql qttest qtxmlpatterns"
211 has ${PN} ${nolibx11_pkgs} && qt_nolibx11 164 has ${PN} ${nolibx11_pkgs} && qt_nolibx11
212 165
213 if use aqua; then 166 if use aqua; then
214 # provide a proper macx-g++-64 167 # provide a proper macx-g++-64
215 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir) 168 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir)
217 sed -e '/^CONFIG/s:app_bundle::' \ 170 sed -e '/^CONFIG/s:app_bundle::' \
218 -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \ 171 -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \
219 -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die 172 -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
220 fi 173 fi
221 174
222 if [[ ${PN} != qt-core ]]; then 175 if [[ ${CATEGORY}/${PN} != dev-qt/qtcore ]]; then
223 skip_qmake_build 176 skip_qmake_build
224 skip_project_generation 177 skip_project_generation
225 symlink_binaries_to_buildtree 178 symlink_binaries_to_buildtree
226 fi 179 fi
227 180
228 if [[ ${CHOST} == *86*-apple-darwin* ]]; then
229 # qmake bus errors with -O2 or -O3 but -O1 works
230 # Bug 373061
231 replace-flags -O[23] -O1
232 fi
233
234 # Bug 178652
235 if [[ $(gcc-major-version) == 3 ]] && use amd64; then
236 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
237 append-flags -fno-gcse
238 fi
239
240 if use_if_iuse c++0x; then 181 if use_if_iuse c++0x; then
241 append-cxxflags -std=c++0x 182 append-cxxflags -std=c++0x
242 fi 183 fi
243 184
244 # Unsupported old gcc versions - hardened needs this :(
245 if [[ $(gcc-major-version) -lt 4 ]]; then
246 ewarn "Appending -fno-stack-protector to CXXFLAGS"
247 append-cxxflags -fno-stack-protector
248 # Bug 253127
249 sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \
250 -i mkspecs/common/g++.conf || die
251 fi
252
253 # Bug 261632 185 # Bug 261632
254 if use ppc64; then 186 if use ppc64; then
255 ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS"
256 append-flags -mminimal-toc 187 append-flags -mminimal-toc
188 fi
189
190 # Bug 373061
191 # qmake bus errors with -O2 or -O3 but -O1 works
192 if [[ ${CHOST} == *86*-apple-darwin* ]]; then
193 replace-flags -O[23] -O1
194 fi
195
196 # Bug 417105
197 # graphite on gcc 4.7 causes miscompilations
198 if [[ $(gcc-version) == "4.7" ]]; then
199 filter-flags -fgraphite-identity
257 fi 200 fi
258 201
259 # Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache 202 # Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
260 sed -e "/^SYSTEM_VARIABLES=/i \ 203 sed -e "/^SYSTEM_VARIABLES=/i \
261 CC='$(tc-getCC)'\n\ 204 CC='$(tc-getCC)'\n\
272 -i configure \ 215 -i configure \
273 || die "sed SYSTEM_VARIABLES failed" 216 || die "sed SYSTEM_VARIABLES failed"
274 217
275 # Respect CC, CXX, LINK and *FLAGS in config.tests 218 # Respect CC, CXX, LINK and *FLAGS in config.tests
276 find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \ 219 find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
277 sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \ 220 sed -i -e "/bin\/qmake/ s: \"\$SRCDIR/: \
278 'QMAKE_CC=$(tc-getCC)' 'QMAKE_CXX=$(tc-getCXX)' 'QMAKE_LINK=$(tc-getCXX)' \ 221 'QMAKE_CC=$(tc-getCC)' 'QMAKE_CXX=$(tc-getCXX)' 'QMAKE_LINK=$(tc-getCXX)' \
279 'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \ 222 'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
280 || die "sed config.tests failed" 223 || die "sed config.tests failed"
281
282 if ! version_is_at_least 4.8; then
283 # Strip predefined CFLAGS from mkspecs (bugs 312689 and 352778)
284 sed -i -e '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf || die
285 fi
286 224
287 # Bug 172219 225 # Bug 172219
288 sed -e 's:/X11R6/:/:' -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die 226 sed -e 's:/X11R6/:/:' -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
289 227
290 if [[ ${CHOST} == *-darwin* ]]; then 228 if [[ ${CHOST} == *-darwin* ]]; then
409 conf+=" -no-separate-debug-info" 347 conf+=" -no-separate-debug-info"
410 348
411 # exceptions USE flag 349 # exceptions USE flag
412 conf+=" $(in_iuse exceptions && qt_use exceptions || echo -exceptions)" 350 conf+=" $(in_iuse exceptions && qt_use exceptions || echo -exceptions)"
413 351
414 # disable rpath on Qt >= 4.8 (bug 380415) 352 # disable rpath (bug 380415), except on prefix (bug 417169)
415 # but leave it enabled on prefix (bug 417169) 353 use prefix || conf+=" -no-rpath"
416 version_is_at_least 4.8 && use !prefix && conf+=" -no-rpath"
417 354
418 # precompiled headers don't work on hardened, where the flag is masked 355 # precompiled headers don't work on hardened, where the flag is masked
419 conf+=" $(qt_use pch)" 356 conf+=" $(qt_use pch)"
420 357
421 # -reduce-relocations 358 # -reduce-relocations
434 if use_if_iuse glib; then 371 if use_if_iuse glib; then
435 local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)" 372 local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)"
436 # avoid the -pthread argument 373 # avoid the -pthread argument
437 conf+=" ${glibflags//-pthread}" 374 conf+=" ${glibflags//-pthread}"
438 unset glibflags 375 unset glibflags
439 fi
440
441 if use_if_iuse qpa; then
442 echo
443 ewarn "The qpa useflag enables the Qt Platform Abstraction, formely"
444 ewarn "known as Qt Lighthouse. If you are not sure what that is, then"
445 ewarn "disable it before reporting any bugs related to this useflag."
446 echo
447 conf+=" -qpa"
448 fi 376 fi
449 377
450 if use aqua; then 378 if use aqua; then
451 # On (snow) leopard use the new (frameworked) cocoa code. 379 # On (snow) leopard use the new (frameworked) cocoa code.
452 if [[ ${CHOST##*-darwin} -ge 9 ]]; then 380 if [[ ${CHOST##*-darwin} -ge 9 ]]; then
490# @FUNCTION: qt4-build_src_test 418# @FUNCTION: qt4-build_src_test
491# @DESCRIPTION: 419# @DESCRIPTION:
492# Runs tests only in target directories. 420# Runs tests only in target directories.
493qt4-build_src_test() { 421qt4-build_src_test() {
494 # QtMultimedia does not have any test suite (bug #332299) 422 # QtMultimedia does not have any test suite (bug #332299)
495 [[ ${PN} == qt-multimedia ]] && return 423 [[ ${CATEGORY}/${PN} == dev-qt/qtmultimedia ]] && return
496 424
497 for dir in ${QT4_TARGET_DIRECTORIES}; do 425 for dir in ${QT4_TARGET_DIRECTORIES}; do
498 emake -j1 check -C ${dir} 426 emake -j1 check -C ${dir}
499 done 427 done
500} 428}
586# @USAGE: < directories > 514# @USAGE: < directories >
587# @INTERNAL 515# @INTERNAL
588# @DESCRIPTION: 516# @DESCRIPTION:
589# Generates Makefiles for the given list of directories. 517# Generates Makefiles for the given list of directories.
590prepare_directories() { 518prepare_directories() {
591 # avoid running over the maximum argument number, bug #299810
592 {
593 echo "${S}"/mkspecs/common/*.conf
594 find "${S}" -name '*.pr[io]'
595 } | xargs sed -i \
596 -e "s:\$\$\[QT_INSTALL_LIBS\]:${QTLIBDIR}:g" \
597 -e "s:\$\$\[QT_INSTALL_PLUGINS\]:${QTPLUGINDIR}:g" \
598 || die
599
600 for x in "$@"; do 519 for x in "$@"; do
601 pushd "${S}"/${x} >/dev/null || die 520 pushd "${S}"/${x} >/dev/null || die
602 einfo "Running qmake in: ${x}" 521 einfo "Running qmake in: ${x}"
603 "${S}"/bin/qmake \ 522 "${S}"/bin/qmake \
604 "LIBS+=-L${QTLIBDIR}" \ 523 "LIBS+=-L${QTLIBDIR}" \
620 AR="$(tc-getAR) cqs" \ 539 AR="$(tc-getAR) cqs" \
621 CC="$(tc-getCC)" \ 540 CC="$(tc-getCC)" \
622 CXX="$(tc-getCXX)" \ 541 CXX="$(tc-getCXX)" \
623 LINK="$(tc-getCXX)" \ 542 LINK="$(tc-getCXX)" \
624 RANLIB=":" \ 543 RANLIB=":" \
625 STRIP=":" \ 544 STRIP=":"
626 || die "emake failed"
627 popd >/dev/null || die 545 popd >/dev/null || die
628 done 546 done
629} 547}
630 548
631# @FUNCTION: install_directories 549# @FUNCTION: install_directories
634# @DESCRIPTION: 552# @DESCRIPTION:
635# Runs emake install in the given directories, which are separated by spaces. 553# Runs emake install in the given directories, which are separated by spaces.
636install_directories() { 554install_directories() {
637 for x in "$@"; do 555 for x in "$@"; do
638 pushd "${S}"/${x} >/dev/null || die 556 pushd "${S}"/${x} >/dev/null || die
639 emake INSTALL_ROOT="${D}" install || die "emake install failed" 557 emake INSTALL_ROOT="${D}" install
640 popd >/dev/null || die 558 popd >/dev/null || die
641 done 559 done
642} 560}
643 561
644# @ECLASS-VARIABLE: QCONFIG_ADD 562# @ECLASS-VARIABLE: QCONFIG_ADD
665 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then 583 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
666 for x in QCONFIG_ADD QCONFIG_REMOVE; do 584 for x in QCONFIG_ADD QCONFIG_REMOVE; do
667 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri 585 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
668 done 586 done
669 insinto ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo 587 insinto ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo
670 doins "${T}"/${PN}-qconfig.pri || die "installing ${PN}-qconfig.pri failed" 588 doins "${T}"/${PN}-qconfig.pri
671 fi 589 fi
672 590
673 if [[ -n ${QCONFIG_DEFINE} ]]; then 591 if [[ -n ${QCONFIG_DEFINE} ]]; then
674 for x in ${QCONFIG_DEFINE}; do 592 for x in ${QCONFIG_DEFINE}; do
675 echo "#define ${x}" >> "${T}"/gentoo-${PN}-qconfig.h 593 echo "#define ${x}" >> "${T}"/gentoo-${PN}-qconfig.h
676 done 594 done
677 insinto ${QTHEADERDIR#${EPREFIX}}/Gentoo 595 insinto ${QTHEADERDIR#${EPREFIX}}/Gentoo
678 doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed" 596 doins "${T}"/gentoo-${PN}-qconfig.h
679 fi 597 fi
680} 598}
681 599
682# @FUNCTION: generate_qconfigs 600# @FUNCTION: generate_qconfigs
683# @INTERNAL 601# @INTERNAL
684# @DESCRIPTION: 602# @DESCRIPTION:
685# Generates gentoo-specific qconfig.{h,pri}. 603# Generates gentoo-specific qconfig.{h,pri}.
686generate_qconfigs() { 604generate_qconfigs() {
687 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${PN} == qt-core ]]; then 605 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == dev-qt/qtcore ]]; then
688 local x qconfig_add qconfig_remove qconfig_new 606 local x qconfig_add qconfig_remove qconfig_new
689 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do 607 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
690 [[ -f ${x} ]] || continue 608 [[ -f ${x} ]] || continue
691 qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")" 609 qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")"
692 qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")" 610 qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
693 done 611 done
694 612
695 # these error checks do not use die because dying in pkg_post{inst,rm} 613 # these error checks do not use die because dying in pkg_post{inst,rm}
696 # just makes things worse. 614 # just makes things worse.
697 if [[ -e "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri ]]; then 615 if [[ -e "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri ]]; then
698 # start with the qconfig.pri that qt-core installed 616 # start with the qconfig.pri that qtcore installed
699 if ! cp "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri \ 617 if ! cp "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri \
700 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then 618 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then
701 eerror "cp qconfig failed." 619 eerror "cp qconfig failed."
702 return 1 620 return 1
703 fi 621 fi
755} 673}
756 674
757# @FUNCTION: skip_qmake_build 675# @FUNCTION: skip_qmake_build
758# @INTERNAL 676# @INTERNAL
759# @DESCRIPTION: 677# @DESCRIPTION:
760# Patches configure to skip qmake compilation, as it's already installed by qt-core. 678# Patches configure to skip qmake compilation, as it's already installed by qtcore.
761skip_qmake_build() { 679skip_qmake_build() {
762 sed -i -e "s:if true:if false:g" "${S}"/configure || die 680 sed -i -e "s:if true:if false:g" "${S}"/configure || die
763} 681}
764 682
765# @FUNCTION: skip_project_generation 683# @FUNCTION: skip_project_generation
873} 791}
874 792
875# @FUNCTION: qt_nolibx11 793# @FUNCTION: qt_nolibx11
876# @INTERNAL 794# @INTERNAL
877# @DESCRIPTION: 795# @DESCRIPTION:
878# Ignore X11 tests for packages that don't need X libraries installed. 796# Skip X11 tests for packages that don't need X libraries installed.
879qt_nolibx11() { 797qt_nolibx11() {
880 sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure || 798 sed -i -e '/^if.*PLATFORM_X11.*CFG_GUI/,/^fi$/d' "${S}"/configure || die
881 die "x11 check sed failed"
882} 799}
883 800
884EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst 801EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst

Legend:
Removed from v.1.139  
changed lines
  Added in v.1.155

  ViewVC Help
Powered by ViewVC 1.1.20