/[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.117 Revision 1.137
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.117 2012/02/09 22:07:34 hwoarang Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.137 2012/10/04 03:52:35 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|5) : ;;
14 *) die "qt4-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
15esac
16
12inherit base eutils multilib toolchain-funcs flag-o-matic versionator 17inherit 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)
39 if version_is_at_least 4.8.1; then
40 SRC_URI="http://releases.qt-project.org/qt4/source/${MY_P}.tar.gz"
41 else
18SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz" 42 SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
19LICENSE="|| ( LGPL-2.1 GPL-3 )" 43 fi
44 ;;
45esac
20 46
21IUSE="aqua debug pch" 47IUSE="aqua debug pch"
22
23[[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] && 48[[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] && IUSE+=" +exceptions"
24[[ ${CATEGORY}/${PN} != x11-themes/qgtkstyle ]] &&
25 IUSE+=" +exceptions"
26
27if version_is_at_least 4.7.99999999; then 49if version_is_at_least 4.8; then
28 IUSE+=" c++0x qpa" 50 [[ ${CATEGORY}/${PN} != x11-libs/qt-webkit ]] && IUSE+=" c++0x"
51 version_is_at_least 4.8.3 || IUSE+=" qpa"
29fi 52fi
30 53
31DEPEND="dev-util/pkgconfig" 54DEPEND="virtual/pkgconfig"
55if [[ ${QT4_BUILD_TYPE} == live ]]; then
56 DEPEND+=" dev-lang/perl"
57fi
58
32RDEPEND=" 59RDEPEND="
33 !<x11-libs/qt-assistant-${PV} 60 !<x11-libs/qt-assistant-${PV}:4
34 !>x11-libs/qt-assistant-${PV}-r9999 61 !>x11-libs/qt-assistant-${PV}-r9999:4
62 !<x11-libs/qt-bearer-${PV}:4
63 !>x11-libs/qt-bearer-${PV}-r9999:4
35 !<x11-libs/qt-core-${PV} 64 !<x11-libs/qt-core-${PV}:4
36 !>x11-libs/qt-core-${PV}-r9999 65 !>x11-libs/qt-core-${PV}-r9999:4
37 !<x11-libs/qt-dbus-${PV} 66 !<x11-libs/qt-dbus-${PV}:4
38 !>x11-libs/qt-dbus-${PV}-r9999 67 !>x11-libs/qt-dbus-${PV}-r9999:4
39 !<x11-libs/qt-declarative-${PV} 68 !<x11-libs/qt-declarative-${PV}:4
40 !>x11-libs/qt-declarative-${PV}-r9999 69 !>x11-libs/qt-declarative-${PV}-r9999:4
41 !<x11-libs/qt-demo-${PV} 70 !<x11-libs/qt-demo-${PV}:4
42 !>x11-libs/qt-demo-${PV}-r9999 71 !>x11-libs/qt-demo-${PV}-r9999:4
43 !<x11-libs/qt-gui-${PV} 72 !<x11-libs/qt-gui-${PV}:4
44 !>x11-libs/qt-gui-${PV}-r9999 73 !>x11-libs/qt-gui-${PV}-r9999:4
45 !<x11-libs/qt-multimedia-${PV} 74 !<x11-libs/qt-multimedia-${PV}:4
46 !>x11-libs/qt-multimedia-${PV}-r9999 75 !>x11-libs/qt-multimedia-${PV}-r9999:4
47 !<x11-libs/qt-opengl-${PV} 76 !<x11-libs/qt-opengl-${PV}:4
48 !>x11-libs/qt-opengl-${PV}-r9999 77 !>x11-libs/qt-opengl-${PV}-r9999:4
78 !<x11-libs/qt-openvg-${PV}:4
79 !>x11-libs/qt-openvg-${PV}-r9999:4
49 !<x11-libs/qt-phonon-${PV} 80 !<x11-libs/qt-phonon-${PV}:4
50 !>x11-libs/qt-phonon-${PV}-r9999 81 !>x11-libs/qt-phonon-${PV}-r9999:4
51 !<x11-libs/qt-qt3support-${PV} 82 !<x11-libs/qt-qt3support-${PV}:4
52 !>x11-libs/qt-qt3support-${PV}-r9999 83 !>x11-libs/qt-qt3support-${PV}-r9999:4
53 !<x11-libs/qt-script-${PV} 84 !<x11-libs/qt-script-${PV}:4
54 !>x11-libs/qt-script-${PV}-r9999 85 !>x11-libs/qt-script-${PV}-r9999:4
55 !<x11-libs/qt-sql-${PV} 86 !<x11-libs/qt-sql-${PV}:4
56 !>x11-libs/qt-sql-${PV}-r9999 87 !>x11-libs/qt-sql-${PV}-r9999:4
57 !<x11-libs/qt-svg-${PV} 88 !<x11-libs/qt-svg-${PV}:4
58 !>x11-libs/qt-svg-${PV}-r9999 89 !>x11-libs/qt-svg-${PV}-r9999:4
59 !<x11-libs/qt-test-${PV} 90 !<x11-libs/qt-test-${PV}:4
60 !>x11-libs/qt-test-${PV}-r9999 91 !>x11-libs/qt-test-${PV}-r9999:4
61 !<x11-libs/qt-webkit-${PV} 92 !<x11-libs/qt-webkit-${PV}:4
62 !>x11-libs/qt-webkit-${PV}-r9999 93 !>x11-libs/qt-webkit-${PV}-r9999:4
63 !<x11-libs/qt-xmlpatterns-${PV} 94 !<x11-libs/qt-xmlpatterns-${PV}:4
64 !>x11-libs/qt-xmlpatterns-${PV}-r9999 95 !>x11-libs/qt-xmlpatterns-${PV}-r9999:4
65" 96"
66 97
67S=${WORKDIR}/${MY_P} 98S=${WORKDIR}/${MY_P}
68 99
69# @FUNCTION: qt4-build_pkg_setup 100# @FUNCTION: qt4-build_pkg_setup
70# @DESCRIPTION: 101# @DESCRIPTION:
71# Sets up PATH and LD_LIBRARY_PATH. 102# Sets up PATH and LD_LIBRARY_PATH.
72qt4-build_pkg_setup() { 103qt4-build_pkg_setup() {
73 [[ ${EAPI} == 2 ]] && use !prefix && EPREFIX= 104 [[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
74 105
75 # Protect users by not allowing downgrades between releases 106 # Protect users by not allowing downgrades between releases.
76 # Downgrading revisions within the same release should be allowed 107 # Downgrading revisions within the same release should be allowed.
77 if has_version '>'${CATEGORY}/${P}-r9999; then 108 if has_version ">${CATEGORY}/${P}-r9999:4"; then
78 if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then 109 if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
79 eerror "Sanity check to keep you from breaking your system:" 110 eerror " *** Sanity check to keep you from breaking your system ***"
80 eerror " Downgrading Qt is completely unsupported and will break your system!" 111 eerror "Downgrading Qt is completely unsupported and will break your system!"
81 die "aborting to save your system" 112 die "aborting to save your system"
82 else 113 else
83 ewarn "Downgrading Qt is completely unsupported and will break your system!" 114 ewarn "Downgrading Qt is completely unsupported and will break your system!"
84 fi 115 fi
85 fi
86
87 if [[ ${PN} == "qt-webkit" ]]; then
88 eshopts_push -s extglob
89 if is-flagq '-g?(gdb)?([1-9])'; then
90 echo
91 ewarn "You have enabled debug info (probably have -g or -ggdb in your \$C{,XX}FLAGS)."
92 ewarn "You may experience really long compilation times and/or increased memory usage."
93 ewarn "If compilation fails, please try removing -g{,gdb} before reporting a bug."
94 ewarn "For more info check out bug #307861"
95 echo
96 fi
97 eshopts_pop
98 fi 116 fi
99 117
100 PATH="${S}/bin${PATH:+:}${PATH}" 118 PATH="${S}/bin${PATH:+:}${PATH}"
101 if [[ ${CHOST} != *-darwin* ]]; then 119 if [[ ${CHOST} != *-darwin* ]]; then
102 LD_LIBRARY_PATH="${S}/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}" 120 LD_LIBRARY_PATH="${S}/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
107 # avoid extract failure. 125 # avoid extract failure.
108 [[ ${CHOST} == *-apple-darwin* ]] && \ 126 [[ ${CHOST} == *-apple-darwin* ]] && \
109 QT4_EXTRACT_DIRECTORIES="src/gui/kernel/qapplication_mac.mm 127 QT4_EXTRACT_DIRECTORIES="src/gui/kernel/qapplication_mac.mm
110 ${QT4_EXTRACT_DIRECTORIES}" 128 ${QT4_EXTRACT_DIRECTORIES}"
111 fi 129 fi
112
113 # Make sure ebuilds use the required EAPI
114 if [[ ${EAPI} != [234] ]]; then
115 eerror "The qt4-build eclass requires EAPI 2,3 or 4 but this ebuild is using"
116 eerror "EAPI=${EAPI:-0}. The ebuild author or editor failed. This ebuild needs to be"
117 eerror "fixed. Using qt4-build eclass without EAPI 2,3 or 4 will fail."
118 die "qt4-build eclass requires EAPI 2,3 or 4"
119 fi
120
121 if ! version_is_at_least 4.1 $(gcc-version); then
122 ewarn "Using a GCC version lower than 4.1 is not supported!"
123 fi
124} 130}
131
132# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
133# @DEFAULT_UNSET
134# @DESCRIPTION:
135# Space-separated list including the directories that will be extracted from
136# Qt tarball.
125 137
126# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES 138# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
139# @DEFAULT_UNSET
127# @DESCRIPTION: 140# @DESCRIPTION:
128# Arguments for build_target_directories. Takes the directories in which the 141# Arguments for build_target_directories. Takes the directories in which the
129# code should be compiled. This is a space-separated list. 142# code should be compiled. This is a space-separated list.
130
131# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
132# @DESCRIPTION:
133# Space-separated list including the directories that will be extracted from
134# Qt tarball.
135 143
136# @FUNCTION: qt4-build_src_unpack 144# @FUNCTION: qt4-build_src_unpack
137# @DESCRIPTION: 145# @DESCRIPTION:
138# Unpacks the sources. 146# Unpacks the sources.
139qt4-build_src_unpack() { 147qt4-build_src_unpack() {
140 setqtenv 148 setqtenv
141 149
150 if ! version_is_at_least 4.1 $(gcc-version); then
151 ewarn "Using a GCC version lower than 4.1 is not supported."
152 fi
153
154 if [[ ${PN} == qt-webkit ]]; then
155 eshopts_push -s extglob
156 if is-flagq '-g?(gdb)?([1-9])'; then
157 echo
158 ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
159 ewarn "You may experience really long compilation times and/or increased memory usage."
160 ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
161 ewarn "For more info check out https://bugs.gentoo.org/307861"
162 echo
163 fi
164 eshopts_pop
165 fi
166
167 case ${QT4_BUILD_TYPE} in
168 live)
169 git-2_src_unpack
170 ;;
171 release)
142 local tarball="${MY_P}.tar.gz" target= targets= 172 local tarball="${MY_P}.tar.gz" target= targets=
143 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \ 173 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
144 src/{qbase,qt_targets,qt_install}.pri bin config.tests \ 174 src/{qbase,qt_targets,qt_install}.pri bin config.tests \
145 mkspecs qmake ${QT4_EXTRACT_DIRECTORIES} 175 mkspecs qmake ${QT4_EXTRACT_DIRECTORIES}
146 do 176 do
147 targets+="${MY_P}/${target} " 177 targets+="${MY_P}/${target} "
148 done 178 done
149 179
150 ebegin "Unpacking parts of ${tarball}:" ${targets//${MY_P}\/} 180 ebegin "Unpacking parts of ${tarball}:" ${targets//${MY_P}\/}
151 tar -xzf "${DISTDIR}/${tarball}" ${targets} 181 tar -xzf "${DISTDIR}/${tarball}" ${targets}
152 eend $? || die "failed to unpack" 182 eend $? || die "failed to unpack"
183 ;;
184 esac
153} 185}
154 186
155# @ECLASS-VARIABLE: PATCHES 187# @ECLASS-VARIABLE: PATCHES
156# @DEFAULT_UNSET 188# @DEFAULT_UNSET
157# @DESCRIPTION: 189# @DESCRIPTION:
169# @DESCRIPTION: 201# @DESCRIPTION:
170# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix 202# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
171# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in /etc/make.conf. 203# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in /etc/make.conf.
172qt4-build_src_prepare() { 204qt4-build_src_prepare() {
173 setqtenv 205 setqtenv
174 cd "${S}"
175 206
207 if [[ ${QT4_BUILD_TYPE} == live ]]; then
208 QTDIR="." ./bin/syncqt || die "syncqt failed"
209 fi
210
176 if version_is_at_least "4.7"; then 211 if version_is_at_least 4.7; then
177 # fix libX11 dependency on non X packages 212 # avoid X11 dependency in non-gui packages
178 local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns" 213 local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"
179 has ${PN} ${nolibx11_pkgs} && qt_nolibx11 214 has ${PN} ${nolibx11_pkgs} && qt_nolibx11
180
181 qt_assistant_cleanup
182 fi 215 fi
183 216
184 if use aqua; then 217 if use aqua; then
185 # provide a proper macx-g++-64 218 # provide a proper macx-g++-64
186 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir) 219 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir)
194 skip_qmake_build 227 skip_qmake_build
195 skip_project_generation 228 skip_project_generation
196 symlink_binaries_to_buildtree 229 symlink_binaries_to_buildtree
197 fi 230 fi
198 231
199 if [[ ${CHOST} == *86*-apple-darwin* ]] ; then 232 if [[ ${CHOST} == *86*-apple-darwin* ]]; then
200 # qmake bus errors with -O2 but -O3 works 233 # qmake bus errors with -O2 or -O3 but -O1 works
234 # Bug 373061
201 replace-flags -O2 -O3 235 replace-flags -O[23] -O1
202 fi 236 fi
203 237
204 # Bug 178652 238 # Bug 178652
205 if [[ $(gcc-major-version) == 3 ]] && use amd64; then 239 if [[ $(gcc-major-version) == 3 ]] && use amd64; then
206 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS" 240 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
207 append-flags -fno-gcse 241 append-flags -fno-gcse
208 fi 242 fi
209 243
210 if use_if_iuse c++0x; then 244 if use_if_iuse c++0x; then
211 ewarn "You are about to build Qt4 using the C++11 standard. Even though"
212 ewarn "this is an official standard, some of the reverse dependencies"
213 ewarn "may fail to compile or link againt the Qt4 libraries. Before"
214 ewarn "reporting a bug, make sure your bug is reproducible with c++0x"
215 ewarn "disabled."
216 append-flags -std=c++0x 245 append-cxxflags -std=c++0x
217 fi 246 fi
218 247
219 # Unsupported old gcc versions - hardened needs this :( 248 # Unsupported old gcc versions - hardened needs this :(
220 if [[ $(gcc-major-version) -lt 4 ]] ; then 249 if [[ $(gcc-major-version) -lt 4 ]]; then
221 ewarn "Appending -fno-stack-protector to CXXFLAGS" 250 ewarn "Appending -fno-stack-protector to CXXFLAGS"
222 append-cxxflags -fno-stack-protector 251 append-cxxflags -fno-stack-protector
223 # Bug 253127 252 # Bug 253127
224 sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \ 253 sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \
225 -i mkspecs/common/g++.conf || die 254 -i mkspecs/common/g++.conf || die
235 sed -e "/^SYSTEM_VARIABLES=/i \ 264 sed -e "/^SYSTEM_VARIABLES=/i \
236 CC='$(tc-getCC)'\n\ 265 CC='$(tc-getCC)'\n\
237 CXX='$(tc-getCXX)'\n\ 266 CXX='$(tc-getCXX)'\n\
238 CFLAGS='${CFLAGS}'\n\ 267 CFLAGS='${CFLAGS}'\n\
239 CXXFLAGS='${CXXFLAGS}'\n\ 268 CXXFLAGS='${CXXFLAGS}'\n\
240 LDFLAGS='${LDFLAGS}'\n" \ 269 LDFLAGS='${LDFLAGS}'\n\
270 QMakeVar set QMAKE_CFLAGS_RELEASE\n\
271 QMakeVar set QMAKE_CFLAGS_DEBUG\n\
272 QMakeVar set QMAKE_CXXFLAGS_RELEASE\n\
273 QMakeVar set QMAKE_CXXFLAGS_DEBUG\n\
274 QMakeVar set QMAKE_LFLAGS_RELEASE\n\
275 QMakeVar set QMAKE_LFLAGS_DEBUG\n"\
241 -i configure \ 276 -i configure \
242 || die "sed SYSTEM_VARIABLES failed" 277 || die "sed SYSTEM_VARIABLES failed"
243 278
244 # Respect CC, CXX, LINK and *FLAGS in config.tests 279 # Respect CC, CXX, LINK and *FLAGS in config.tests
245 find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \ 280 find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
246 sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \ 281 sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \
247 '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)' \
248 'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \ 283 'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
249 || die "sed config.tests failed" 284 || die "sed config.tests failed"
250 285
286 if ! version_is_at_least 4.8; then
251 # Strip predefined CFLAGS from mkspecs (bug 312689) 287 # Strip predefined CFLAGS from mkspecs (bugs 312689 and 352778)
252 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
253 290
254 # Bug 172219 291 # Bug 172219
255 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
256 293
257 if [[ ${CHOST} == *-darwin* ]]; then 294 if [[ ${CHOST} == *-darwin* ]]; then
258 # Set FLAGS *and* remove -arch, since our gcc-apple is multilib 295 # Set FLAGS *and* remove -arch, since our gcc-apple is multilib
259 # 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
260 sed \ 307 sed \
261 -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ 308 -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
262 -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ 309 -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
263 -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}:" \
264 -e "s:-arch\s\w*::g" \ 311 -e "s:-arch\s\w*::g" \
265 -i mkspecs/common/mac-g++.conf \ 312 -i ${mac_gpp_conf} \
266 || die "sed mkspecs/common/mac-g++.conf failed" 313 || die "sed ${mac_gpp_conf} failed"
267 314
268 # 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
269 # fix arch handling (automagically duplicates our -arch arg and breaks 316 # fix arch handling (automagically duplicates our -arch arg and breaks
270 # 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
271 sed \ 322 sed \
272 -e "s:-arch i386::" \ 323 -e "s:-arch i386::" \
273 -e "s:-arch ppc::" \ 324 -e "s:-arch ppc::" \
274 -e "s:-arch x86_64::" \ 325 -e "s:-arch x86_64::" \
275 -e "s:-arch ppc64::" \ 326 -e "s:-arch ppc64::" \
276 -e "s:-arch \$i::" \ 327 -e "s:-arch \$i::" \
277 -e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \ 328 -e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \
278 -e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \ 329 -e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \
279 -e "s:-Xarch_x86_64::g" \ 330 -e "s:-Xarch_x86_64::g" \
280 -e "s:-Xarch_ppc64::g" \ 331 -e "s:-Xarch_ppc64::g" \
281 -i configure mkspecs/common/mac-g++.conf \ 332 -i configure ${mac_gcc_confs} \
282 || die "sed -arch/-Xarch failed" 333 || die "sed -arch/-Xarch failed"
283 334
284 # 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.
285 if [[ ${CHOST} == *-apple-darwin10 ]] ; then 336 if [[ ${CHOST} == *-apple-darwin10 ]]; then
286 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" \
287 -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" \
288 -i configure mkspecs/common/mac-g++.conf \ 339 -i configure ${mac_gpp_conf} \
289 || die "sed deployment target failed" 340 || die "sed deployment target failed"
290 fi 341 fi
291 fi 342 fi
292 343
293 # 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
294 # Darwin, for which the sources already cater for -liconv 345 # Darwin, for which the sources already cater for -liconv
295 if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] ; then 346 if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
296 sed -e 's|mac:\(LIBS += -liconv\)|\1|g' \ 347 sed -e 's|mac:\(LIBS += -liconv\)|\1|g' \
297 -i config.tests/unix/iconv/iconv.pro \ 348 -i config.tests/unix/iconv/iconv.pro \
298 || die "sed iconv.pro failed" 349 || die "sed iconv.pro failed"
299 fi 350 fi
300 351
305 sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die 356 sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die
306 # do not flirt with non-Prefix stuff, we're quite possessive 357 # do not flirt with non-Prefix stuff, we're quite possessive
307 sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \ 358 sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \
308 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die 359 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
309 360
310 base_src_prepare 361 # apply patches
362 [[ -n ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
363 epatch_user
311} 364}
312 365
313# @FUNCTION: qt4-build_src_configure 366# @FUNCTION: qt4-build_src_configure
314# @DESCRIPTION: 367# @DESCRIPTION:
315# Default configure phase 368# Default configure phase
316qt4-build_src_configure() { 369qt4-build_src_configure() {
317 setqtenv 370 setqtenv
318 myconf="$(standard_configure_options) ${myconf}" 371
372 local conf="
373 -prefix ${QTPREFIXDIR}
374 -bindir ${QTBINDIR}
375 -libdir ${QTLIBDIR}
376 -docdir ${QTDOCDIR}
377 -headerdir ${QTHEADERDIR}
378 -plugindir ${QTPLUGINDIR}
379 $(version_is_at_least 4.7 && echo -importdir ${QTIMPORTDIR})
380 -datadir ${QTDATADIR}
381 -translationdir ${QTTRANSDIR}
382 -sysconfdir ${QTSYSCONFDIR}
383 -examplesdir ${QTEXAMPLESDIR}
384 -demosdir ${QTDEMOSDIR}
385 -opensource -confirm-license
386 -shared -fast -largefile -stl -verbose
387 -nomake examples -nomake demos"
388
389 # ARCH is set on Gentoo. Qt now falls back to generic on an unsupported
390 # $(tc-arch). Therefore we convert it to supported values.
391 case "$(tc-arch)" in
392 amd64|x64-*) conf+=" -arch x86_64" ;;
393 ppc-macos) conf+=" -arch ppc" ;;
394 ppc|ppc64|ppc-*) conf+=" -arch powerpc" ;;
395 sparc|sparc-*|sparc64-*) conf+=" -arch sparc" ;;
396 x86-macos) conf+=" -arch x86" ;;
397 x86|x86-*) conf+=" -arch i386" ;;
398 alpha|arm|ia64|mips|s390) conf+=" -arch $(tc-arch)" ;;
399 hppa|sh) conf+=" -arch generic" ;;
400 *) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
401 esac
402
403 conf+=" -platform $(qt_mkspecs_dir)"
404
405 [[ $(get_libdir) != lib ]] && conf+=" -L${EPREFIX}/usr/$(get_libdir)"
406
407 # debug/release
408 if use debug; then
409 conf+=" -debug"
410 else
411 conf+=" -release"
412 fi
413 conf+=" -no-separate-debug-info"
414
415 # exceptions USE flag
416 conf+=" $(in_iuse exceptions && qt_use exceptions || echo -exceptions)"
417
418 # disable rpath on Qt >= 4.8 (bug 380415)
419 # but leave it enabled on prefix (bug 417169)
420 version_is_at_least 4.8 && use !prefix && conf+=" -no-rpath"
421
422 # precompiled headers don't work on hardened, where the flag is masked
423 conf+=" $(qt_use pch)"
424
425 # -reduce-relocations
426 # This flag seems to introduce major breakage to applications,
427 # mostly to be seen as a core dump with the message "QPixmap: Must
428 # construct a QApplication before a QPaintDevice" on Solaris.
429 # -- Daniel Vergien
430 [[ ${CHOST} != *-solaris* ]] && conf+=" -reduce-relocations"
319 431
320 # this one is needed for all systems with a separate -liconv, apart from 432 # this one is needed for all systems with a separate -liconv, apart from
321 # Darwin, for which the sources already cater for -liconv 433 # Darwin, for which the sources already cater for -liconv
322 use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \ 434 if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
323 myconf+=" -liconv" 435 conf+=" -liconv"
436 fi
324 437
325 if use_if_iuse glib; then 438 if use_if_iuse glib; then
326 # use -I, -L and -l from configure
327 local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)" 439 local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)"
328 # avoid the -pthread argument 440 # avoid the -pthread argument
329 myconf+=" ${glibflags//-pthread}" 441 conf+=" ${glibflags//-pthread}"
330 unset glibflags 442 unset glibflags
331 fi 443 fi
332 444
333 if use_if_iuse qpa; then 445 if use_if_iuse qpa; then
334 ewarn 446 echo
335 ewarn "The qpa useflag enables the Qt Platform Abstraction, formely" 447 ewarn "The qpa useflag enables the Qt Platform Abstraction, formely"
336 ewarn "known as Qt Lighthouse. If you are not sure what that is, then" 448 ewarn "known as Qt Lighthouse. If you are not sure what that is, then"
337 ewarn "disable it before reporting any bugs related to this useflag." 449 ewarn "disable it before reporting any bugs related to this useflag."
338 ewarn 450 echo
339 myconf+=" -qpa" 451 conf+=" -qpa"
340 fi 452 fi
341 453
342 if use aqua ; then 454 if use aqua; then
343 # On (snow) leopard use the new (frameworked) cocoa code. 455 # On (snow) leopard use the new (frameworked) cocoa code.
344 if [[ ${CHOST##*-darwin} -ge 9 ]] ; then 456 if [[ ${CHOST##*-darwin} -ge 9 ]]; then
345 myconf+=" -cocoa -framework" 457 conf+=" -cocoa -framework"
458 # We need the source's headers, not the installed ones.
459 conf+=" -I${S}/include"
460 # Add hint for the framework location.
461 conf+=" -F${QTLIBDIR}"
346 462
347 # We are crazy and build cocoa + qt3support :-) 463 # We are crazy and build cocoa + qt3support :-)
348 if use qt3support; then 464 if use qt3support; then
349 sed -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \ 465 sed -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \
350 -i configure || die 466 -i configure || die
351 fi 467 fi
352 468 else
353 # We need the source's headers, not the installed ones. 469 conf+=" -no-framework"
354 myconf+=" -I${S}/include"
355
356 # Add hint for the framework location.
357 myconf+=" -F${QTLIBDIR}"
358 fi 470 fi
359 else 471 else
360 # freetype2 include dir is non-standard, thus include it on configure 472 # freetype2 include dir is non-standard, thus pass it to configure
361 # use -I from configure
362 myconf+=" $(pkg-config --cflags freetype2)" 473 conf+=" $(pkg-config --cflags-only-I freetype2)"
363 fi 474 fi
364 475
476 conf+=" ${myconf}"
477 myconf=
478
365 echo ./configure ${myconf} 479 echo ./configure ${conf}
366 ./configure ${myconf} || die "./configure failed" 480 ./configure ${conf} || die "./configure failed"
367 myconf=""
368 481
369 prepare_directories ${QT4_TARGET_DIRECTORIES} 482 prepare_directories ${QT4_TARGET_DIRECTORIES}
370} 483}
371 484
372# @FUNCTION: qt4-build_src_compile 485# @FUNCTION: qt4-build_src_compile
380 493
381# @FUNCTION: qt4-build_src_test 494# @FUNCTION: qt4-build_src_test
382# @DESCRIPTION: 495# @DESCRIPTION:
383# Runs tests only in target directories. 496# Runs tests only in target directories.
384qt4-build_src_test() { 497qt4-build_src_test() {
498 # QtMultimedia does not have any test suite (bug #332299)
499 [[ ${PN} == qt-multimedia ]] && return
500
385 for dir in ${QT4_TARGET_DIRECTORIES}; do 501 for dir in ${QT4_TARGET_DIRECTORIES}; do
386 emake -j1 check -C ${dir} 502 emake -j1 check -C ${dir}
387 done 503 done
388} 504}
389 505
390# @FUNCTION: fix_includes 506# @FUNCTION: fix_includes
391# @DESCRIPTION: 507# @DESCRIPTION:
392# For MacOS X we need to add some symlinks when frameworks are 508# For MacOS X we need to add some symlinks when frameworks are
393# being used, to avoid complications with some more or less stupid packages. 509# being used, to avoid complications with some more or less stupid packages.
394fix_includes() { 510fix_includes() {
395 if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then 511 if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
512 local frw dest f h rdir
396 # Some packages tend to include <Qt/...> 513 # Some packages tend to include <Qt/...>
397 dodir "${QTHEADERDIR#${EPREFIX}}"/Qt 514 dodir "${QTHEADERDIR#${EPREFIX}}"/Qt
398 515
399 # Fake normal headers when frameworks are installed... eases life later on 516 # Fake normal headers when frameworks are installed... eases life later
400 local dest f h 517 # on, make sure we use relative links though, as some ebuilds assume
518 # these dirs exist in src_install to add additional files
519 f=${QTHEADERDIR}
520 h=${QTLIBDIR}
521 while [[ -n ${f} && ${f%%/*} == ${h%%/*} ]] ; do
522 f=${f#*/}
523 h=${h#*/}
524 done
525 rdir=${h}
526 f="../"
527 while [[ ${h} == */* ]] ; do
528 f="${f}../"
529 h=${h#*/}
530 done
531 rdir="${f}${rdir}"
532
401 for frw in "${D}${QTLIBDIR}"/*.framework; do 533 for frw in "${D}${QTLIBDIR}"/*.framework; do
402 [[ -e "${frw}"/Headers ]] || continue 534 [[ -e "${frw}"/Headers ]] || continue
403 f=$(basename ${frw}) 535 f=$(basename ${frw})
404 dest="${QTHEADERDIR#${EPREFIX}}"/${f%.framework} 536 dest="${QTHEADERDIR#${EPREFIX}}"/${f%.framework}
405 dosym "${QTLIBDIR#${EPREFIX}}"/${f}/Headers "${dest}" 537 dosym "${rdir}"/${f}/Headers "${dest}"
406 538
407 # Link normal headers as well. 539 # Link normal headers as well.
408 for hdr in "${D}/${QTLIBDIR}/${f}"/Headers/*; do 540 for hdr in "${D}/${QTLIBDIR}/${f}"/Headers/*; do
409 h=$(basename ${hdr}) 541 h=$(basename ${hdr})
410 dosym "${QTLIBDIR#${EPREFIX}}"/${f}/Headers/${h} "${QTHEADERDIR#${EPREFIX}}"/Qt/${h} 542 dosym "../${rdir}"/${f}/Headers/${h} \
543 "${QTHEADERDIR#${EPREFIX}}"/Qt/${h}
411 done 544 done
412 done 545 done
413 fi 546 fi
414} 547}
415 548
448 QTDEMOSDIR=${QTDATADIR}/demos 581 QTDEMOSDIR=${QTDATADIR}/demos
449 QMAKE_LIBDIR_QT=${QTLIBDIR} 582 QMAKE_LIBDIR_QT=${QTLIBDIR}
450 QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4 583 QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4
451 584
452 PLATFORM=$(qt_mkspecs_dir) 585 PLATFORM=$(qt_mkspecs_dir)
453
454 unset QMAKESPEC 586 unset QMAKESPEC
455}
456 587
457# @FUNCTION: standard_configure_options 588 export XDG_CONFIG_HOME="${T}"
458# @INTERNAL
459# @DESCRIPTION:
460# Sets up some standard configure options, like libdir (if necessary), whether
461# debug info is wanted or not.
462standard_configure_options() {
463 local myconf="-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
464 -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR}
465 $(version_is_at_least 4.7 && echo -importdir ${QTIMPORTDIR})
466 -datadir ${QTDATADIR} -translationdir ${QTTRANSDIR} -sysconfdir ${QTSYSCONFDIR}
467 -examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR}
468 -opensource -confirm-license -shared -fast -largefile -stl -verbose
469 -platform $(qt_mkspecs_dir) -nomake examples -nomake demos"
470
471 [[ $(get_libdir) != lib ]] && myconf+=" -L${EPREFIX}/usr/$(get_libdir)"
472
473 # debug/release
474 if use debug; then
475 myconf+=" -debug"
476 else
477 myconf+=" -release"
478 fi
479 myconf+=" -no-separate-debug-info"
480
481 # exceptions USE flag
482 local exceptions="-exceptions"
483 in_iuse exceptions && exceptions="$(qt_use exceptions)"
484 myconf+=" ${exceptions}"
485
486 # disable RPATH on Qt >= 4.8 (bug 380415)
487 version_is_at_least 4.8 && myconf+=" -no-rpath"
488
489 # precompiled headers don't work on hardened, where the flag is masked
490 myconf+=" $(qt_use pch)"
491
492 # -reduce-relocations
493 # This flag seems to introduce major breakage to applications,
494 # mostly to be seen as a core dump with the message "QPixmap: Must
495 # construct a QApplication before a QPaintDevice" on Solaris.
496 # -- Daniel Vergien
497 [[ ${CHOST} != *-solaris* ]] && myconf+=" -reduce-relocations"
498
499 use aqua && myconf+=" -no-framework"
500
501 # ARCH is set on Gentoo. Qt now falls back to generic on an unsupported
502 # $(tc-arch). Therefore we convert it to supported values.
503 case "$(tc-arch)" in
504 amd64|x64-*) myconf+=" -arch x86_64" ;;
505 ppc-macos) myconf+=" -arch ppc" ;;
506 ppc|ppc64|ppc-*) myconf+=" -arch powerpc" ;;
507 sparc|sparc-*|sparc64-*) myconf+=" -arch sparc" ;;
508 x86-macos) myconf+=" -arch x86" ;;
509 x86|x86-*) myconf+=" -arch i386" ;;
510 alpha|arm|ia64|mips|s390) myconf+=" -arch $(tc-arch)" ;;
511 hppa|sh) myconf+=" -arch generic" ;;
512 *) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
513 esac
514
515 echo "${myconf}"
516} 589}
517 590
518# @FUNCTION: prepare_directories 591# @FUNCTION: prepare_directories
519# @USAGE: < directories > 592# @USAGE: < directories >
520# @INTERNAL 593# @INTERNAL
607# @FUNCTION: generate_qconfigs 680# @FUNCTION: generate_qconfigs
608# @INTERNAL 681# @INTERNAL
609# @DESCRIPTION: 682# @DESCRIPTION:
610# Generates gentoo-specific qconfig.{h,pri}. 683# Generates gentoo-specific qconfig.{h,pri}.
611generate_qconfigs() { 684generate_qconfigs() {
612 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then 685 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${PN} == qt-core ]]; then
613 local x qconfig_add qconfig_remove qconfig_new 686 local x qconfig_add qconfig_remove qconfig_new
614 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do 687 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
615 [[ -f ${x} ]] || continue 688 [[ -f ${x} ]] || continue
616 qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")" 689 qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")"
617 qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")" 690 qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
748# @RETURN: the specs-directory w/o path 821# @RETURN: the specs-directory w/o path
749# @DESCRIPTION: 822# @DESCRIPTION:
750# Allows us to define which mkspecs dir we want to use. 823# Allows us to define which mkspecs dir we want to use.
751qt_mkspecs_dir() { 824qt_mkspecs_dir() {
752 local spec= 825 local spec=
826
753 case ${CHOST} in 827 case "${CHOST}" in
754 *-freebsd*|*-dragonfly*) 828 *-freebsd*|*-dragonfly*)
755 spec=freebsd ;; 829 spec=freebsd ;;
756 *-openbsd*) 830 *-openbsd*)
757 spec=openbsd ;; 831 spec=openbsd ;;
758 *-netbsd*) 832 *-netbsd*)
769 *-solaris*) 843 *-solaris*)
770 spec=solaris ;; 844 spec=solaris ;;
771 *-linux-*|*-linux) 845 *-linux-*|*-linux)
772 spec=linux ;; 846 spec=linux ;;
773 *) 847 *)
774 die "Unknown CHOST, no platform chosen" 848 die "${FUNCNAME}(): Unknown CHOST '${CHOST}'" ;;
775 esac 849 esac
776 850
777 CXX=$(tc-getCXX) 851 case "$(tc-getCXX)" in
778 if [[ ${CXX} == *g++* ]]; then 852 *g++*)
779 spec+=-g++ 853 spec+=-g++ ;;
780 elif [[ ${CXX} == *icpc* ]]; then 854 *icpc*)
781 spec+=-icc 855 spec+=-icc ;;
782 else 856 *)
783 die "Unknown compiler '${CXX}'" 857 die "${FUNCNAME}(): Unknown compiler '$(tc-getCXX)'" ;;
784 fi 858 esac
785 859
786 # Add -64 for 64bit profiles 860 # Add -64 for 64bit profiles
787 if use x64-freebsd || 861 if use x64-freebsd ||
788 use amd64-linux || 862 use amd64-linux ||
789 use x64-macos || 863 use x64-macos ||
794 fi 868 fi
795 869
796 echo "${spec}" 870 echo "${spec}"
797} 871}
798 872
799# @FUNCTION: qt_assistant_cleanup
800# @INTERNAL
801# @DESCRIPTION:
802# Tries to clean up tools.pro for qt-assistant ebuilds.
803# Meant to be called in src_prepare().
804# Since Qt 4.7.4 this function is a no-op.
805qt_assistant_cleanup() {
806 # apply patching to qt-assistant ebuilds only
807 [[ ${PN} != "qt-assistant" ]] && return
808
809 # no longer needed for 4.7.4 and later
810 version_is_at_least "4.7.4" && return
811
812 # different versions (and branches...) may need different handling,
813 # add a case if you need special handling
814 case "${MY_PV_EXTRA}" in
815 *kde-qt*)
816 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \
817 -e "/mac/,/^embedded.*makeqpf$/d" \
818 -i tools/tools.pro || die "patching tools.pro failed"
819 ;;
820 *)
821 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \
822 -e "/mac/,/^embedded.*makeqpf$/d" \
823 -e "s/^\([ \t]*pixeltool\) /\1 qdoc3 /" \
824 -i tools/tools.pro || die "patching tools.pro failed"
825 ;;
826 esac
827}
828
829# @FUNCTION: qt_nolibx11 873# @FUNCTION: qt_nolibx11
830# @INTERNAL 874# @INTERNAL
831# @DESCRIPTION: 875# @DESCRIPTION:
832# Ignore X11 tests for packages that don't need X libraries installed. 876# Ignore X11 tests for packages that don't need X libraries installed.
833qt_nolibx11() { 877qt_nolibx11() {

Legend:
Removed from v.1.117  
changed lines
  Added in v.1.137

  ViewVC Help
Powered by ViewVC 1.1.20