/[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.111 Revision 1.135
1# Copyright 1999-2011 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.111 2011/12/27 16:04:27 pesa Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.135 2012/09/06 08:30:00 kensington 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 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} != [23] ]]; then
115 eerror "The qt4-build eclass requires EAPI=2 or EAPI=3, 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 or EAPI=3 will fail."
118 die "qt4-build eclass requires EAPI=2 or EAPI=3"
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 local target targets= 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)
172 local tarball="${MY_P}.tar.gz" target= targets=
142 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \ 173 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
143 src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \ 174 src/{qbase,qt_targets,qt_install}.pri bin config.tests \
144 ${QT4_EXTRACT_DIRECTORIES}; do 175 mkspecs qmake ${QT4_EXTRACT_DIRECTORIES}
176 do
145 targets+=" ${MY_P}/${target}" 177 targets+="${MY_P}/${target} "
146 done 178 done
147 179
180 ebegin "Unpacking parts of ${tarball}:" ${targets//${MY_P}\/}
148 echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} 181 tar -xzf "${DISTDIR}/${tarball}" ${targets}
149 tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die 182 eend $? || die "failed to unpack"
183 ;;
184 esac
150} 185}
151 186
152# @ECLASS-VARIABLE: PATCHES 187# @ECLASS-VARIABLE: PATCHES
153# @DEFAULT_UNSET 188# @DEFAULT_UNSET
154# @DESCRIPTION: 189# @DESCRIPTION:
166# @DESCRIPTION: 201# @DESCRIPTION:
167# 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
168# 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.
169qt4-build_src_prepare() { 204qt4-build_src_prepare() {
170 setqtenv 205 setqtenv
171 cd "${S}"
172 206
207 if [[ ${QT4_BUILD_TYPE} == live ]]; then
208 QTDIR="." ./bin/syncqt || die "syncqt failed"
209 fi
210
173 if version_is_at_least "4.7"; then 211 if version_is_at_least 4.7; then
174 # fix libX11 dependency on non X packages 212 # avoid X11 dependency in non-gui packages
175 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"
176 has ${PN} ${nolibx11_pkgs} && qt_nolibx11 214 has ${PN} ${nolibx11_pkgs} && qt_nolibx11
177
178 qt_assistant_cleanup
179 fi 215 fi
180 216
181 if use aqua; then 217 if use aqua; then
182 # provide a proper macx-g++-64 218 # provide a proper macx-g++-64
183 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir) 219 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir)
191 skip_qmake_build 227 skip_qmake_build
192 skip_project_generation 228 skip_project_generation
193 symlink_binaries_to_buildtree 229 symlink_binaries_to_buildtree
194 fi 230 fi
195 231
196 if [[ ${CHOST} == *86*-apple-darwin* ]] ; then 232 if [[ ${CHOST} == *86*-apple-darwin* ]]; then
197 # qmake bus errors with -O2 but -O3 works 233 # qmake bus errors with -O2 or -O3 but -O1 works
234 # Bug 373061
198 replace-flags -O2 -O3 235 replace-flags -O[23] -O1
199 fi 236 fi
200 237
201 # Bug 178652 238 # Bug 178652
202 if [[ $(gcc-major-version) == 3 ]] && use amd64; then 239 if [[ $(gcc-major-version) == 3 ]] && use amd64; then
203 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS" 240 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
204 append-flags -fno-gcse 241 append-flags -fno-gcse
205 fi 242 fi
206 243
207 if use_if_iuse c++0x; then 244 if use_if_iuse c++0x; then
208 ewarn "You are about to build Qt4 using the C++11 standard. Even though"
209 ewarn "this is an official standard, some of the reverse dependencies"
210 ewarn "may fail to compile or link againt the Qt4 libraries. Before"
211 ewarn "reporting a bug, make sure your bug is reproducible with c++0x"
212 ewarn "disabled."
213 append-flags -std=c++0x 245 append-cxxflags -std=c++0x
214 fi 246 fi
215 247
216 # Unsupported old gcc versions - hardened needs this :( 248 # Unsupported old gcc versions - hardened needs this :(
217 if [[ $(gcc-major-version) -lt 4 ]] ; then 249 if [[ $(gcc-major-version) -lt 4 ]]; then
218 ewarn "Appending -fno-stack-protector to CXXFLAGS" 250 ewarn "Appending -fno-stack-protector to CXXFLAGS"
219 append-cxxflags -fno-stack-protector 251 append-cxxflags -fno-stack-protector
220 # Bug 253127 252 # Bug 253127
221 sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \ 253 sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \
222 -i mkspecs/common/g++.conf || die 254 -i mkspecs/common/g++.conf || die
232 sed -e "/^SYSTEM_VARIABLES=/i \ 264 sed -e "/^SYSTEM_VARIABLES=/i \
233 CC='$(tc-getCC)'\n\ 265 CC='$(tc-getCC)'\n\
234 CXX='$(tc-getCXX)'\n\ 266 CXX='$(tc-getCXX)'\n\
235 CFLAGS='${CFLAGS}'\n\ 267 CFLAGS='${CFLAGS}'\n\
236 CXXFLAGS='${CXXFLAGS}'\n\ 268 CXXFLAGS='${CXXFLAGS}'\n\
237 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"\
276 -i configure \
238 -i configure || die "sed SYSTEM_VARIABLES failed" 277 || die "sed SYSTEM_VARIABLES failed"
239 278
240 # Bug 321335 279 # Respect CC, CXX, LINK and *FLAGS in config.tests
241 find config.tests/unix -name '*.test' -type f -exec grep -lZ \$MAKE '{}' \; | xargs -0 \ 280 find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
242 sed -e "s:\(\$MAKE\):\1 CC='$(tc-getCC)' CXX='$(tc-getCXX)' LINK='$(tc-getCXX)':g" \ 281 sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \
243 -i || die "sed test compilers failed" 282 'QMAKE_CC=$(tc-getCC)' 'QMAKE_CXX=$(tc-getCXX)' 'QMAKE_LINK=$(tc-getCXX)' \
283 'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
284 || die "sed config.tests failed"
285
286 if ! version_is_at_least 4.8; then
287 # Strip predefined CFLAGS from mkspecs (bugs 312689 and 352778)
288 sed -i -e '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf || die
289 fi
244 290
245 # Bug 172219 291 # Bug 172219
246 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
247 293
248 if [[ ${CHOST} == *-darwin* ]]; then 294 if [[ ${CHOST} == *-darwin* ]]; then
249 # Set FLAGS *and* remove -arch, since our gcc-apple is multilib 295 # Set FLAGS *and* remove -arch, since our gcc-apple is multilib
250 # 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
307 sed \
251 sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ 308 -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
252 -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ 309 -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
253 -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}:" \
254 -e "s:-arch\s\w*::g" \ 311 -e "s:-arch\s\w*::g" \
255 -i mkspecs/common/mac-g++.conf || die "sed mkspecs/common/mac-g++.conf failed" 312 -i ${mac_gpp_conf} \
313 || die "sed ${mac_gpp_conf} failed"
256 314
257 # 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
258 # fix arch handling (automagically duplicates our -arch arg and breaks 316 # fix arch handling (automagically duplicates our -arch arg and breaks
259 # 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
260 sed \ 322 sed \
261 -e "s:-arch i386::" \ 323 -e "s:-arch i386::" \
262 -e "s:-arch ppc::" \ 324 -e "s:-arch ppc::" \
263 -e "s:-arch x86_64::" \ 325 -e "s:-arch x86_64::" \
264 -e "s:-arch ppc64::" \ 326 -e "s:-arch ppc64::" \
265 -e "s:-arch \$i::" \ 327 -e "s:-arch \$i::" \
266 -e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \ 328 -e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \
267 -e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \ 329 -e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \
268 -e "s:-Xarch_x86_64::g" \ 330 -e "s:-Xarch_x86_64::g" \
269 -e "s:-Xarch_ppc64::g" \ 331 -e "s:-Xarch_ppc64::g" \
270 -i configure mkspecs/common/mac-g++.conf || die "sed -arch/-Xarch failed" 332 -i configure ${mac_gcc_confs} \
333 || die "sed -arch/-Xarch failed"
271 334
272 # 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.
273 if [[ ${CHOST} == *-apple-darwin10 ]] ; then 336 if [[ ${CHOST} == *-apple-darwin10 ]]; then
274 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" \
275 -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" \
276 -i configure mkspecs/common/mac-g++.conf || die "sed deployment target failed" 339 -i configure ${mac_gpp_conf} \
340 || die "sed deployment target failed"
277 fi 341 fi
278 fi 342 fi
279 343
280 # 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
281 # Darwin, for which the sources already cater for -liconv 345 # Darwin, for which the sources already cater for -liconv
282 if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] ; then 346 if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
283 sed \ 347 sed -e 's|mac:\(LIBS += -liconv\)|\1|g' \
284 -e "s|mac:LIBS += -liconv|LIBS += -liconv|g" \
285 -i config.tests/unix/iconv/iconv.pro \ 348 -i config.tests/unix/iconv/iconv.pro \
286 || die "sed on iconv.pro failed" 349 || die "sed iconv.pro failed"
287 fi 350 fi
288 351
289 # we need some patches for Solaris 352 # we need some patches for Solaris
290 sed -i \
291 -e '/^QMAKE_LFLAGS_THREAD/a\QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \ 353 sed -i -e '/^QMAKE_LFLAGS_THREAD/a\QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \
292 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die 354 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
293 # use GCC over SunStudio 355 # use GCC over SunStudio
294 sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die 356 sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die
295 # don't flirt with non-Prefix stuff, we're quite possessive 357 # do not flirt with non-Prefix stuff, we're quite possessive
296 sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \ 358 sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \
297 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die 359 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
298 # strip predefined CFLAGS from qmake ( bug #312689 )
299 sed -i '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf
300 360
301 base_src_prepare 361 # apply patches
362 [[ -n ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
363 epatch_user
302} 364}
303 365
304# @FUNCTION: qt4-build_src_configure 366# @FUNCTION: qt4-build_src_configure
305# @DESCRIPTION: 367# @DESCRIPTION:
306# Default configure phase 368# Default configure phase
307qt4-build_src_configure() { 369qt4-build_src_configure() {
308 setqtenv 370 setqtenv
309 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"
310 431
311 # 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
312 # Darwin, for which the sources already cater for -liconv 433 # Darwin, for which the sources already cater for -liconv
313 use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \ 434 if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
314 myconf+=" -liconv" 435 conf+=" -liconv"
436 fi
315 437
316 if use_if_iuse glib; then 438 if use_if_iuse glib; then
317 # use -I, -L and -l from configure
318 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)"
319 # avoid the -pthread argument 440 # avoid the -pthread argument
320 myconf+=" ${glibflags//-pthread}" 441 conf+=" ${glibflags//-pthread}"
321 unset glibflags 442 unset glibflags
322 fi 443 fi
323 444
324 if use_if_iuse qpa; then 445 if use_if_iuse qpa; then
325 ewarn 446 echo
326 ewarn "The qpa useflag enables the Qt Platform Abstraction, formely" 447 ewarn "The qpa useflag enables the Qt Platform Abstraction, formely"
327 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"
328 ewarn "disable it before reporting any bugs related to this useflag." 449 ewarn "disable it before reporting any bugs related to this useflag."
329 ewarn 450 echo
330 myconf+=" -qpa" 451 conf+=" -qpa"
331 fi 452 fi
332 453
333 if use aqua ; then 454 if use aqua; then
334 # On (snow) leopard use the new (frameworked) cocoa code. 455 # On (snow) leopard use the new (frameworked) cocoa code.
335 if [[ ${CHOST##*-darwin} -ge 9 ]] ; then 456 if [[ ${CHOST##*-darwin} -ge 9 ]]; then
336 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}"
337 462
338 # We are crazy and build cocoa + qt3support :-) 463 # We are crazy and build cocoa + qt3support :-)
339 if use qt3support; then 464 if use qt3support; then
340 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\"|" \
341 -i configure 466 -i configure || die
342 fi 467 fi
343 468 else
344 # We need the source's headers, not the installed ones. 469 conf+=" -no-framework"
345 myconf+=" -I${S}/include"
346
347 # Add hint for the framework location.
348 myconf+=" -F${QTLIBDIR}"
349 fi 470 fi
350 else 471 else
351 # freetype2 include dir is non-standard, thus include it on configure 472 # freetype2 include dir is non-standard, thus pass it to configure
352 # use -I from configure
353 myconf+=" $(pkg-config --cflags freetype2)" 473 conf+=" $(pkg-config --cflags-only-I freetype2)"
354 fi 474 fi
355 475
476 conf+=" ${myconf}"
477 myconf=
478
356 echo ./configure ${myconf} 479 echo ./configure ${conf}
357 ./configure ${myconf} || die "./configure failed" 480 ./configure ${conf} || die "./configure failed"
358 myconf=""
359 481
360 prepare_directories ${QT4_TARGET_DIRECTORIES} 482 prepare_directories ${QT4_TARGET_DIRECTORIES}
361} 483}
362 484
363# @FUNCTION: qt4-build_src_compile 485# @FUNCTION: qt4-build_src_compile
371 493
372# @FUNCTION: qt4-build_src_test 494# @FUNCTION: qt4-build_src_test
373# @DESCRIPTION: 495# @DESCRIPTION:
374# Runs tests only in target directories. 496# Runs tests only in target directories.
375qt4-build_src_test() { 497qt4-build_src_test() {
498 # QtMultimedia does not have any test suite (bug #332299)
499 [[ ${PN} == qt-multimedia ]] && return
500
376 for dir in ${QT4_TARGET_DIRECTORIES}; do 501 for dir in ${QT4_TARGET_DIRECTORIES}; do
377 emake -j1 check -C ${dir} 502 emake -j1 check -C ${dir}
378 done 503 done
379} 504}
380 505
381# @FUNCTION: fix_includes 506# @FUNCTION: fix_includes
382# @DESCRIPTION: 507# @DESCRIPTION:
383# 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
384# 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.
385fix_includes() { 510fix_includes() {
386 if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then 511 if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
512 local frw dest f h rdir
387 # Some packages tend to include <Qt/...> 513 # Some packages tend to include <Qt/...>
388 dodir "${QTHEADERDIR#${EPREFIX}}"/Qt 514 dodir "${QTHEADERDIR#${EPREFIX}}"/Qt
389 515
390 # Fake normal headers when frameworks are installed... eases life later on 516 # Fake normal headers when frameworks are installed... eases life later
391 local dest f 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
392 for frw in "${D}${QTLIBDIR}"/*.framework; do 533 for frw in "${D}${QTLIBDIR}"/*.framework; do
393 [[ -e "${frw}"/Headers ]] || continue 534 [[ -e "${frw}"/Headers ]] || continue
394 f=$(basename ${frw}) 535 f=$(basename ${frw})
395 dest="${QTHEADERDIR#${EPREFIX}}"/${f%.framework} 536 dest="${QTHEADERDIR#${EPREFIX}}"/${f%.framework}
396 dosym "${QTLIBDIR#${EPREFIX}}"/${f}/Headers "${dest}" 537 dosym "${rdir}"/${f}/Headers "${dest}"
397 538
398 # Link normal headers as well. 539 # Link normal headers as well.
399 for hdr in "${D}/${QTLIBDIR}/${f}"/Headers/*; do 540 for hdr in "${D}/${QTLIBDIR}/${f}"/Headers/*; do
400 h=$(basename ${hdr}) 541 h=$(basename ${hdr})
401 dosym "${QTLIBDIR#${EPREFIX}}"/${f}/Headers/${h} "${QTHEADERDIR#${EPREFIX}}"/Qt/${h} 542 dosym "../${rdir}"/${f}/Headers/${h} \
543 "${QTHEADERDIR#${EPREFIX}}"/Qt/${h}
402 done 544 done
403 done 545 done
404 fi 546 fi
405} 547}
406 548
415 install_qconfigs 557 install_qconfigs
416 fix_library_files 558 fix_library_files
417 fix_includes 559 fix_includes
418 560
419 # remove .la files since we are building only shared Qt libraries 561 # remove .la files since we are building only shared Qt libraries
420 find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm 562 find "${D}"${QTLIBDIR} -type f -name '*.la' -print0 | xargs -0 rm -f
421} 563}
422 564
423# @FUNCTION: setqtenv 565# @FUNCTION: setqtenv
424# @INTERNAL 566# @INTERNAL
425setqtenv() { 567setqtenv() {
439 QTDEMOSDIR=${QTDATADIR}/demos 581 QTDEMOSDIR=${QTDATADIR}/demos
440 QMAKE_LIBDIR_QT=${QTLIBDIR} 582 QMAKE_LIBDIR_QT=${QTLIBDIR}
441 QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4 583 QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4
442 584
443 PLATFORM=$(qt_mkspecs_dir) 585 PLATFORM=$(qt_mkspecs_dir)
444
445 unset QMAKESPEC 586 unset QMAKESPEC
446}
447 587
448# @FUNCTION: standard_configure_options 588 export XDG_CONFIG_HOME="${T}"
449# @INTERNAL
450# @DESCRIPTION:
451# Sets up some standard configure options, like libdir (if necessary), whether
452# debug info is wanted or not.
453standard_configure_options() {
454 local myconf="-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
455 -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR}
456 -importdir ${QTIMPORTDIR} -datadir ${QTDATADIR} -translationdir ${QTTRANSDIR}
457 -sysconfdir ${QTSYSCONFDIR} -examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR}
458 -opensource -confirm-license -shared -fast -largefile -stl -verbose
459 -platform $(qt_mkspecs_dir) -nomake examples -nomake demos"
460
461 [[ $(get_libdir) != lib ]] && myconf+=" -L${EPREFIX}/usr/$(get_libdir)"
462
463 # debug/release
464 if use debug; then
465 myconf+=" -debug"
466 else
467 myconf+=" -release"
468 fi
469 myconf+=" -no-separate-debug-info"
470
471 # exceptions USE flag
472 local exceptions="-exceptions"
473 in_iuse exceptions && exceptions="$(qt_use exceptions)"
474 myconf+=" ${exceptions}"
475
476 # disable RPATH on Qt >= 4.8 (bug 380415)
477 version_is_at_least 4.8 && myconf+=" -no-rpath"
478
479 # precompiled headers don't work on hardened, where the flag is masked
480 myconf+=" $(qt_use pch)"
481
482 # -reduce-relocations
483 # This flag seems to introduce major breakage to applications,
484 # mostly to be seen as a core dump with the message "QPixmap: Must
485 # construct a QApplication before a QPaintDevice" on Solaris.
486 # -- Daniel Vergien
487 [[ ${CHOST} != *-solaris* ]] && myconf+=" -reduce-relocations"
488
489 use aqua && myconf+=" -no-framework"
490
491 # ARCH is set on Gentoo. Qt now falls back to generic on an unsupported
492 # $(tc-arch). Therefore we convert it to supported values.
493 case "$(tc-arch)" in
494 amd64|x64-*) myconf+=" -arch x86_64" ;;
495 ppc-macos) myconf+=" -arch ppc" ;;
496 ppc|ppc64|ppc-*) myconf+=" -arch powerpc" ;;
497 sparc|sparc-*|sparc64-*) myconf+=" -arch sparc" ;;
498 x86-macos) myconf+=" -arch x86" ;;
499 x86|x86-*) myconf+=" -arch i386" ;;
500 alpha|arm|ia64|mips|s390) myconf+=" -arch $(tc-arch)" ;;
501 hppa|sh) myconf+=" -arch generic" ;;
502 *) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
503 esac
504
505 echo "${myconf}"
506} 589}
507 590
508# @FUNCTION: prepare_directories 591# @FUNCTION: prepare_directories
509# @USAGE: < directories > 592# @USAGE: < directories >
510# @INTERNAL 593# @INTERNAL
597# @FUNCTION: generate_qconfigs 680# @FUNCTION: generate_qconfigs
598# @INTERNAL 681# @INTERNAL
599# @DESCRIPTION: 682# @DESCRIPTION:
600# Generates gentoo-specific qconfig.{h,pri}. 683# Generates gentoo-specific qconfig.{h,pri}.
601generate_qconfigs() { 684generate_qconfigs() {
602 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
603 local x qconfig_add qconfig_remove qconfig_new 686 local x qconfig_add qconfig_remove qconfig_new
604 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do 687 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
605 [[ -f ${x} ]] || continue 688 [[ -f ${x} ]] || continue
606 qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")" 689 qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")"
607 qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")" 690 qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
738# @RETURN: the specs-directory w/o path 821# @RETURN: the specs-directory w/o path
739# @DESCRIPTION: 822# @DESCRIPTION:
740# Allows us to define which mkspecs dir we want to use. 823# Allows us to define which mkspecs dir we want to use.
741qt_mkspecs_dir() { 824qt_mkspecs_dir() {
742 local spec= 825 local spec=
826
743 case ${CHOST} in 827 case "${CHOST}" in
744 *-freebsd*|*-dragonfly*) 828 *-freebsd*|*-dragonfly*)
745 spec=freebsd ;; 829 spec=freebsd ;;
746 *-openbsd*) 830 *-openbsd*)
747 spec=openbsd ;; 831 spec=openbsd ;;
748 *-netbsd*) 832 *-netbsd*)
759 *-solaris*) 843 *-solaris*)
760 spec=solaris ;; 844 spec=solaris ;;
761 *-linux-*|*-linux) 845 *-linux-*|*-linux)
762 spec=linux ;; 846 spec=linux ;;
763 *) 847 *)
764 die "Unknown CHOST, no platform chosen" 848 die "${FUNCNAME}(): Unknown CHOST '${CHOST}'" ;;
765 esac 849 esac
766 850
767 CXX=$(tc-getCXX) 851 case "$(tc-getCXX)" in
768 if [[ ${CXX} == *g++* ]]; then 852 *g++*)
769 spec+=-g++ 853 spec+=-g++ ;;
770 elif [[ ${CXX} == *icpc* ]]; then 854 *icpc*)
771 spec+=-icc 855 spec+=-icc ;;
772 else 856 *)
773 die "Unknown compiler '${CXX}'" 857 die "${FUNCNAME}(): Unknown compiler '$(tc-getCXX)'" ;;
774 fi 858 esac
775 if [[ -n ${LIBDIR/lib} ]]; then
776 spec+=-${LIBDIR/lib}
777 fi
778 859
779 # Add -64 for 64bit profiles 860 # Add -64 for 64bit profiles
780 if use x64-freebsd || 861 if use x64-freebsd ||
781 use amd64-linux || 862 use amd64-linux ||
782 use x64-macos || 863 use x64-macos ||
787 fi 868 fi
788 869
789 echo "${spec}" 870 echo "${spec}"
790} 871}
791 872
792# @FUNCTION: qt_assistant_cleanup
793# @INTERNAL
794# @DESCRIPTION:
795# Tries to clean up tools.pro for qt-assistant ebuilds.
796# Meant to be called in src_prepare().
797# Since Qt 4.7.4 this function is a no-op.
798qt_assistant_cleanup() {
799 # apply patching to qt-assistant ebuilds only
800 [[ ${PN} != "qt-assistant" ]] && return
801
802 # no longer needed for 4.7.4 and later
803 version_is_at_least "4.7.4" && return
804
805 # different versions (and branches...) may need different handling,
806 # add a case if you need special handling
807 case "${MY_PV_EXTRA}" in
808 *kde-qt*)
809 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \
810 -e "/mac/,/^embedded.*makeqpf$/d" \
811 -i tools/tools.pro || die "patching tools.pro failed"
812 ;;
813 *)
814 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \
815 -e "/mac/,/^embedded.*makeqpf$/d" \
816 -e "s/^\([ \t]*pixeltool\) /\1 qdoc3 /" \
817 -i tools/tools.pro || die "patching tools.pro failed"
818 ;;
819 esac
820}
821
822# @FUNCTION: qt_nolibx11 873# @FUNCTION: qt_nolibx11
823# @INTERNAL 874# @INTERNAL
824# @DESCRIPTION: 875# @DESCRIPTION:
825# 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.
826qt_nolibx11() { 877qt_nolibx11() {

Legend:
Removed from v.1.111  
changed lines
  Added in v.1.135

  ViewVC Help
Powered by ViewVC 1.1.20