/[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.123 Revision 1.159
1# Copyright 1999-2012 Gentoo Foundation 1# Copyright 1999-2015 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.123 2012/03/08 14:24:40 pesa Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.159 2015/03/06 14:08:07 dlan 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 2|3|4) : ;; 13 4|5) : ;;
14 *) die "qt4-build.eclass requires EAPI 2, 3 or 4." ;; 14 *) die "qt4-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
15esac 15esac
16 16
17inherit base eutils multilib toolchain-funcs flag-o-matic versionator 17inherit eutils flag-o-matic multilib toolchain-funcs
18 18
19MY_PV=${PV/_/-}
20MY_P=qt-everywhere-opensource-src-${MY_PV}
21
22HOMEPAGE="http://qt.nokia.com/ http://qt-project.org/" 19HOMEPAGE="https://www.qt.io/ https://qt-project.org/"
23SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
24LICENSE="|| ( LGPL-2.1 GPL-3 )" 20LICENSE="|| ( LGPL-2.1 GPL-3 )"
21SLOT="4"
22
23case ${PV} in
24 4.?.9999)
25 QT4_BUILD_TYPE="live"
26 EGIT_REPO_URI=(
27 "git://gitorious.org/qt/qt.git"
28 "https://git.gitorious.org/qt/qt.git"
29 )
30 EGIT_BRANCH=${PV%.9999}
31 inherit git-r3
32 ;;
33 *)
34 QT4_BUILD_TYPE="release"
35 MY_P=qt-everywhere-opensource-src-${PV/_/-}
36 SRC_URI="http://download.qt.io/archive/qt/${PV%.*}/${PV}/${MY_P}.tar.gz"
37 S=${WORKDIR}/${MY_P}
38 ;;
39esac
25 40
26IUSE="aqua debug pch" 41IUSE="aqua debug pch"
42[[ ${PN} != qtxmlpatterns ]] && IUSE+=" +exceptions"
27 43
28[[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] && 44DEPEND="virtual/pkgconfig"
29[[ ${CATEGORY}/${PN} != x11-themes/qgtkstyle ]] && 45if [[ ${QT4_BUILD_TYPE} == live ]]; then
30 IUSE+=" +exceptions" 46 DEPEND+=" dev-lang/perl"
31
32if version_is_at_least 4.7.99999999; then
33 IUSE+=" c++0x qpa"
34fi 47fi
35
36DEPEND="dev-util/pkgconfig"
37RDEPEND="
38 !<x11-libs/qt-assistant-${PV}
39 !>x11-libs/qt-assistant-${PV}-r9999
40 !<x11-libs/qt-core-${PV}
41 !>x11-libs/qt-core-${PV}-r9999
42 !<x11-libs/qt-dbus-${PV}
43 !>x11-libs/qt-dbus-${PV}-r9999
44 !<x11-libs/qt-declarative-${PV}
45 !>x11-libs/qt-declarative-${PV}-r9999
46 !<x11-libs/qt-demo-${PV}
47 !>x11-libs/qt-demo-${PV}-r9999
48 !<x11-libs/qt-gui-${PV}
49 !>x11-libs/qt-gui-${PV}-r9999
50 !<x11-libs/qt-multimedia-${PV}
51 !>x11-libs/qt-multimedia-${PV}-r9999
52 !<x11-libs/qt-opengl-${PV}
53 !>x11-libs/qt-opengl-${PV}-r9999
54 !<x11-libs/qt-openvg-${PV}
55 !>x11-libs/qt-openvg-${PV}-r9999
56 !<x11-libs/qt-phonon-${PV}
57 !>x11-libs/qt-phonon-${PV}-r9999
58 !<x11-libs/qt-qt3support-${PV}
59 !>x11-libs/qt-qt3support-${PV}-r9999
60 !<x11-libs/qt-script-${PV}
61 !>x11-libs/qt-script-${PV}-r9999
62 !<x11-libs/qt-sql-${PV}
63 !>x11-libs/qt-sql-${PV}-r9999
64 !<x11-libs/qt-svg-${PV}
65 !>x11-libs/qt-svg-${PV}-r9999
66 !<x11-libs/qt-test-${PV}
67 !>x11-libs/qt-test-${PV}-r9999
68 !<x11-libs/qt-webkit-${PV}
69 !>x11-libs/qt-webkit-${PV}-r9999
70 !<x11-libs/qt-xmlpatterns-${PV}
71 !>x11-libs/qt-xmlpatterns-${PV}-r9999
72"
73
74S=${WORKDIR}/${MY_P}
75 48
76# @FUNCTION: qt4-build_pkg_setup 49# @FUNCTION: qt4-build_pkg_setup
77# @DESCRIPTION: 50# @DESCRIPTION:
78# Sets up PATH and LD_LIBRARY_PATH. 51# Sets up PATH and LD_LIBRARY_PATH.
79qt4-build_pkg_setup() { 52qt4-build_pkg_setup() {
80 [[ ${EAPI} == 2 ]] && use !prefix && EPREFIX= 53 # Warn users of possible breakage when downgrading to a previous release.
81
82 # Protect users by not allowing downgrades between releases
83 # Downgrading revisions within the same release should be allowed 54 # Downgrading revisions within the same release is safe.
84 if has_version '>'${CATEGORY}/${P}-r9999; then 55 if has_version ">${CATEGORY}/${P}-r9999:4"; then
85 if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then 56 ewarn
86 eerror "Sanity check to keep you from breaking your system:"
87 eerror " Downgrading Qt is completely unsupported and will break your system!"
88 die "aborting to save your system"
89 else
90 ewarn "Downgrading Qt is completely unsupported and will break your system!" 57 ewarn "Downgrading Qt is completely unsupported and can break your system!"
91 fi 58 ewarn
92 fi
93
94 if [[ ${PN} == qt-webkit ]]; then
95 eshopts_push -s extglob
96 if is-flagq '-g?(gdb)?([1-9])'; then
97 echo
98 ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
99 ewarn "You may experience really long compilation times and/or increased memory usage."
100 ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
101 ewarn "For more info check out bug #307861"
102 echo
103 fi
104 eshopts_pop
105 fi 59 fi
106 60
107 PATH="${S}/bin${PATH:+:}${PATH}" 61 PATH="${S}/bin${PATH:+:}${PATH}"
108 if [[ ${CHOST} != *-darwin* ]]; then 62 if [[ ${CHOST} != *-darwin* ]]; then
109 LD_LIBRARY_PATH="${S}/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}" 63 LD_LIBRARY_PATH="${S}/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
114 # avoid extract failure. 68 # avoid extract failure.
115 [[ ${CHOST} == *-apple-darwin* ]] && \ 69 [[ ${CHOST} == *-apple-darwin* ]] && \
116 QT4_EXTRACT_DIRECTORIES="src/gui/kernel/qapplication_mac.mm 70 QT4_EXTRACT_DIRECTORIES="src/gui/kernel/qapplication_mac.mm
117 ${QT4_EXTRACT_DIRECTORIES}" 71 ${QT4_EXTRACT_DIRECTORIES}"
118 fi 72 fi
119
120 if ! version_is_at_least 4.1 $(gcc-version); then
121 ewarn "Using a GCC version lower than 4.1 is not supported."
122 fi
123} 73}
74
75# @ECLASS-VARIABLE: PATCHES
76# @DEFAULT_UNSET
77# @DESCRIPTION:
78# Array variable containing all the patches to be applied. This variable
79# is expected to be defined in the global scope of ebuilds. Make sure to
80# specify the full path. This variable is used in src_prepare phase.
81#
82# Example:
83# @CODE
84# PATCHES=(
85# "${FILESDIR}/mypatch.patch"
86# "${FILESDIR}/patches_folder/"
87# )
88# @CODE
89
90# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
91# @DEFAULT_UNSET
92# @DESCRIPTION:
93# Space-separated list of directories that will be extracted
94# from Qt tarball.
124 95
125# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES 96# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
97# @DEFAULT_UNSET
126# @DESCRIPTION: 98# @DESCRIPTION:
127# Arguments for build_target_directories. Takes the directories in which the
128# code should be compiled. This is a space-separated list.
129
130# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
131# @DESCRIPTION:
132# Space-separated list including the directories that will be extracted from 99# Space-separated list of directories that will be configured,
133# Qt tarball. 100# compiled, and installed. All paths must be relative to ${S}.
134 101
135# @FUNCTION: qt4-build_src_unpack 102# @FUNCTION: qt4-build_src_unpack
136# @DESCRIPTION: 103# @DESCRIPTION:
137# Unpacks the sources. 104# Unpacks the sources.
138qt4-build_src_unpack() { 105qt4-build_src_unpack() {
139 setqtenv 106 setqtenv
140 107
108 if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ]]; then
109 ewarn
110 ewarn "Using a GCC version lower than 4.4 is not supported."
111 ewarn
112 fi
113
114 if [[ ${PN} == qtwebkit ]]; then
115 eshopts_push -s extglob
116 if is-flagq '-g?(gdb)?([1-9])'; then
117 ewarn
118 ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
119 ewarn "You may experience really long compilation times and/or increased memory usage."
120 ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
121 ewarn "For more info check out https://bugs.gentoo.org/307861"
122 ewarn
123 fi
124 eshopts_pop
125 fi
126
127 case ${QT4_BUILD_TYPE} in
128 live)
129 git-r3_src_unpack
130 ;;
131 release)
141 local tarball="${MY_P}.tar.gz" target= targets= 132 local tarball="${MY_P}.tar.gz" target= targets=
142 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \ 133 for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
143 src/{qbase,qt_targets,qt_install}.pri bin config.tests \ 134 src/{qbase,qt_targets,qt_install}.pri bin config.tests \
144 mkspecs qmake ${QT4_EXTRACT_DIRECTORIES} 135 mkspecs qmake ${QT4_EXTRACT_DIRECTORIES}
145 do 136 do
146 targets+="${MY_P}/${target} " 137 targets+="${MY_P}/${target} "
147 done 138 done
148 139
149 ebegin "Unpacking parts of ${tarball}:" ${targets//${MY_P}\/} 140 ebegin "Unpacking parts of ${tarball}:" ${targets//${MY_P}\/}
150 tar -xzf "${DISTDIR}/${tarball}" ${targets} 141 tar -xzf "${DISTDIR}/${tarball}" ${targets}
151 eend $? || die "failed to unpack" 142 eend $? || die "failed to unpack"
143 ;;
144 esac
152} 145}
153
154# @ECLASS-VARIABLE: PATCHES
155# @DEFAULT_UNSET
156# @DESCRIPTION:
157# PATCHES array variable containing all various patches to be applied.
158# This variable is expected to be defined in global scope of ebuild.
159# Make sure to specify the full path. This variable is utilised in
160# src_unpack/src_prepare phase, based on EAPI.
161#
162# @CODE
163# PATCHES=( "${FILESDIR}/mypatch.patch"
164# "${FILESDIR}/patches_folder/" )
165# @CODE
166 146
167# @FUNCTION: qt4-build_src_prepare 147# @FUNCTION: qt4-build_src_prepare
168# @DESCRIPTION: 148# @DESCRIPTION:
169# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix 149# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
170# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in /etc/make.conf. 150# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in make.conf.
171qt4-build_src_prepare() { 151qt4-build_src_prepare() {
172 setqtenv 152 setqtenv
173 cd "${S}"
174 153
175 if version_is_at_least 4.7; then 154 if [[ ${QT4_BUILD_TYPE} == live ]]; then
155 QTDIR="." ./bin/syncqt || die "syncqt failed"
156 fi
157
176 # fix libX11 dependency on non X packages 158 # avoid X11 dependency in non-gui packages
177 local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns" 159 local nolibx11_pkgs="qtbearer qtcore qtdbus qtscript qtsql qttest qtxmlpatterns"
178 has ${PN} ${nolibx11_pkgs} && qt_nolibx11 160 has ${PN} ${nolibx11_pkgs} && qt_nolibx11
179
180 qt_assistant_cleanup
181 fi
182 161
183 if use aqua; then 162 if use aqua; then
184 # provide a proper macx-g++-64 163 # provide a proper macx-g++-64
185 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir) 164 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir)
186 165
187 sed -e '/^CONFIG/s:app_bundle::' \ 166 sed -e '/^CONFIG/s:app_bundle::' \
188 -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \ 167 -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \
189 -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die 168 -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
190 fi 169 fi
191 170
192 if [[ ${PN} != qt-core ]]; then 171 if [[ ${CATEGORY}/${PN} != dev-qt/qtcore ]]; then
193 skip_qmake_build 172 skip_qmake_build
194 skip_project_generation 173 skip_project_generation
195 symlink_binaries_to_buildtree 174 symlink_binaries_to_buildtree
196 fi 175 fi
197 176
198 if [[ ${CHOST} == *86*-apple-darwin* ]]; then
199 # qmake bus errors with -O2 but -O3 works
200 replace-flags -O2 -O3
201 fi
202
203 # Bug 178652
204 if [[ $(gcc-major-version) == 3 ]] && use amd64; then
205 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
206 append-flags -fno-gcse
207 fi
208
209 if use_if_iuse c++0x; then 177 if use_if_iuse c++0x; then
210 echo
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 echo
217 append-flags -std=c++0x 178 append-cxxflags -std=c++0x
218 fi
219
220 # Unsupported old gcc versions - hardened needs this :(
221 if [[ $(gcc-major-version) -lt 4 ]]; then
222 ewarn "Appending -fno-stack-protector to CXXFLAGS"
223 append-cxxflags -fno-stack-protector
224 # Bug 253127
225 sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \
226 -i mkspecs/common/g++.conf || die
227 fi 179 fi
228 180
229 # Bug 261632 181 # Bug 261632
230 if use ppc64; then 182 if use ppc64; then
231 ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS"
232 append-flags -mminimal-toc 183 append-flags -mminimal-toc
184 fi
185
186 # Bug 373061
187 # qmake bus errors with -O2 or -O3 but -O1 works
188 if [[ ${CHOST} == *86*-apple-darwin* ]]; then
189 replace-flags -O[23] -O1
190 fi
191
192 # Bug 417105
193 # graphite on gcc 4.7 causes miscompilations
194 if [[ $(gcc-version) == "4.7" ]]; then
195 filter-flags -fgraphite-identity
233 fi 196 fi
234 197
235 # Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache 198 # Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
236 sed -e "/^SYSTEM_VARIABLES=/i \ 199 sed -e "/^SYSTEM_VARIABLES=/i \
237 CC='$(tc-getCC)'\n\ 200 CC='$(tc-getCC)'\n\
238 CXX='$(tc-getCXX)'\n\ 201 CXX='$(tc-getCXX)'\n\
239 CFLAGS='${CFLAGS}'\n\ 202 CFLAGS='${CFLAGS}'\n\
240 CXXFLAGS='${CXXFLAGS}'\n\ 203 CXXFLAGS='${CXXFLAGS}'\n\
241 LDFLAGS='${LDFLAGS}'\n" \ 204 LDFLAGS='${LDFLAGS}'\n\
205 QMakeVar set QMAKE_CFLAGS_RELEASE\n\
206 QMakeVar set QMAKE_CFLAGS_DEBUG\n\
207 QMakeVar set QMAKE_CXXFLAGS_RELEASE\n\
208 QMakeVar set QMAKE_CXXFLAGS_DEBUG\n\
209 QMakeVar set QMAKE_LFLAGS_RELEASE\n\
210 QMakeVar set QMAKE_LFLAGS_DEBUG\n"\
242 -i configure \ 211 -i configure \
243 || die "sed SYSTEM_VARIABLES failed" 212 || die "sed SYSTEM_VARIABLES failed"
244 213
245 # Respect CC, CXX, LINK and *FLAGS in config.tests 214 # Respect CC, CXX, LINK and *FLAGS in config.tests
246 find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \ 215 find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
247 sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \ 216 sed -i -e "/bin\/qmake/ s: \"\$SRCDIR/: \
248 'QMAKE_CC=$(tc-getCC)' 'QMAKE_CXX=$(tc-getCXX)' 'QMAKE_LINK=$(tc-getCXX)' \ 217 'QMAKE_CC=$(tc-getCC)' 'QMAKE_CXX=$(tc-getCXX)' 'QMAKE_LINK=$(tc-getCXX)' \
249 'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \ 218 'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
250 || die "sed config.tests failed" 219 || die "sed config.tests failed"
251 220
252 # Strip predefined CFLAGS from mkspecs (bug 312689)
253 sed -i -e '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf || die
254
255 # Bug 172219 221 # Bug 172219
256 sed -e 's:/X11R6/:/:' -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die 222 sed -e 's:/X11R6/:/:' -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
257 223
258 if [[ ${CHOST} == *-darwin* ]]; then 224 if [[ ${CHOST} == *-darwin* ]]; then
259 # Set FLAGS *and* remove -arch, since our gcc-apple is multilib 225 # Set FLAGS *and* remove -arch, since our gcc-apple is multilib
260 # crippled (by design) :/ 226 # crippled (by design) :/
227 local mac_gpp_conf=
228 if [[ -f mkspecs/common/mac-g++.conf ]]; then
229 # qt < 4.8 has mac-g++.conf
230 mac_gpp_conf="mkspecs/common/mac-g++.conf"
231 elif [[ -f mkspecs/common/g++-macx.conf ]]; then
232 # qt >= 4.8 has g++-macx.conf
233 mac_gpp_conf="mkspecs/common/g++-macx.conf"
234 else
235 die "no known conf file for mac found"
236 fi
261 sed \ 237 sed \
262 -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ 238 -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
263 -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ 239 -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
264 -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=-headerpad_max_install_names ${LDFLAGS}:" \ 240 -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=-headerpad_max_install_names ${LDFLAGS}:" \
265 -e "s:-arch\s\w*::g" \ 241 -e "s:-arch\s\w*::g" \
266 -i mkspecs/common/mac-g++.conf \ 242 -i ${mac_gpp_conf} \
267 || die "sed mkspecs/common/mac-g++.conf failed" 243 || die "sed ${mac_gpp_conf} failed"
268 244
269 # Fix configure's -arch settings that appear in qmake/Makefile and also 245 # Fix configure's -arch settings that appear in qmake/Makefile and also
270 # fix arch handling (automagically duplicates our -arch arg and breaks 246 # fix arch handling (automagically duplicates our -arch arg and breaks
271 # pch). Additionally disable Xarch support. 247 # pch). Additionally disable Xarch support.
248 local mac_gcc_confs="${mac_gpp_conf}"
249 if [[ -f mkspecs/common/gcc-base-macx.conf ]]; then
250 mac_gcc_confs+=" mkspecs/common/gcc-base-macx.conf"
251 fi
272 sed \ 252 sed \
273 -e "s:-arch i386::" \ 253 -e "s:-arch i386::" \
274 -e "s:-arch ppc::" \ 254 -e "s:-arch ppc::" \
275 -e "s:-arch x86_64::" \ 255 -e "s:-arch x86_64::" \
276 -e "s:-arch ppc64::" \ 256 -e "s:-arch ppc64::" \
277 -e "s:-arch \$i::" \ 257 -e "s:-arch \$i::" \
278 -e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \ 258 -e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \
279 -e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \ 259 -e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \
280 -e "s:-Xarch_x86_64::g" \ 260 -e "s:-Xarch_x86_64::g" \
281 -e "s:-Xarch_ppc64::g" \ 261 -e "s:-Xarch_ppc64::g" \
282 -i configure mkspecs/common/mac-g++.conf \ 262 -i configure ${mac_gcc_confs} \
283 || die "sed -arch/-Xarch failed" 263 || die "sed -arch/-Xarch failed"
284 264
285 # On Snow Leopard don't fall back to 10.5 deployment target. 265 # On Snow Leopard don't fall back to 10.5 deployment target.
286 if [[ ${CHOST} == *-apple-darwin10 ]]; then 266 if [[ ${CHOST} == *-apple-darwin10 ]]; then
287 sed -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \ 267 sed -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \
288 -e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \ 268 -e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \
289 -i configure mkspecs/common/mac-g++.conf \ 269 -i configure ${mac_gpp_conf} \
290 || die "sed deployment target failed" 270 || die "sed deployment target failed"
291 fi 271 fi
292 fi 272 fi
293 273
294 # this one is needed for all systems with a separate -liconv, apart from 274 # this one is needed for all systems with a separate -liconv, apart from
306 sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die 286 sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die
307 # do not flirt with non-Prefix stuff, we're quite possessive 287 # do not flirt with non-Prefix stuff, we're quite possessive
308 sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \ 288 sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \
309 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die 289 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
310 290
311 base_src_prepare 291 # apply patches
292 [[ -n ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
293 epatch_user
312} 294}
313 295
314# @FUNCTION: qt4-build_src_configure 296# @FUNCTION: qt4-build_src_configure
315# @DESCRIPTION: 297# @DESCRIPTION:
316# Default configure phase 298# Default configure phase
322 -bindir ${QTBINDIR} 304 -bindir ${QTBINDIR}
323 -libdir ${QTLIBDIR} 305 -libdir ${QTLIBDIR}
324 -docdir ${QTDOCDIR} 306 -docdir ${QTDOCDIR}
325 -headerdir ${QTHEADERDIR} 307 -headerdir ${QTHEADERDIR}
326 -plugindir ${QTPLUGINDIR} 308 -plugindir ${QTPLUGINDIR}
327 $(version_is_at_least 4.7 && echo -importdir ${QTIMPORTDIR}) 309 -importdir ${QTIMPORTDIR}
328 -datadir ${QTDATADIR} 310 -datadir ${QTDATADIR}
329 -translationdir ${QTTRANSDIR} 311 -translationdir ${QTTRANSDIR}
330 -sysconfdir ${QTSYSCONFDIR} 312 -sysconfdir ${QTSYSCONFDIR}
331 -examplesdir ${QTEXAMPLESDIR} 313 -examplesdir ${QTEXAMPLESDIR}
332 -demosdir ${QTDEMOSDIR} 314 -demosdir ${QTDEMOSDIR}
341 ppc-macos) conf+=" -arch ppc" ;; 323 ppc-macos) conf+=" -arch ppc" ;;
342 ppc|ppc64|ppc-*) conf+=" -arch powerpc" ;; 324 ppc|ppc64|ppc-*) conf+=" -arch powerpc" ;;
343 sparc|sparc-*|sparc64-*) conf+=" -arch sparc" ;; 325 sparc|sparc-*|sparc64-*) conf+=" -arch sparc" ;;
344 x86-macos) conf+=" -arch x86" ;; 326 x86-macos) conf+=" -arch x86" ;;
345 x86|x86-*) conf+=" -arch i386" ;; 327 x86|x86-*) conf+=" -arch i386" ;;
346 alpha|arm|ia64|mips|s390) conf+=" -arch $(tc-arch)" ;; 328 alpha|arm|arm64|ia64|mips|s390) conf+=" -arch $(tc-arch)" ;;
347 hppa|sh) conf+=" -arch generic" ;; 329 hppa|sh) conf+=" -arch generic" ;;
348 *) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;; 330 *) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
349 esac 331 esac
350 332
351 conf+=" -platform $(qt_mkspecs_dir)" 333 conf+=" -platform $(qt_mkspecs_dir)"
361 conf+=" -no-separate-debug-info" 343 conf+=" -no-separate-debug-info"
362 344
363 # exceptions USE flag 345 # exceptions USE flag
364 conf+=" $(in_iuse exceptions && qt_use exceptions || echo -exceptions)" 346 conf+=" $(in_iuse exceptions && qt_use exceptions || echo -exceptions)"
365 347
366 # disable RPATH on Qt >= 4.8 (bug 380415) 348 # disable rpath (bug 380415), except on prefix (bug 417169)
367 version_is_at_least 4.8 && conf+=" -no-rpath" 349 use prefix || conf+=" -no-rpath"
368 350
369 # precompiled headers don't work on hardened, where the flag is masked 351 # precompiled headers don't work on hardened, where the flag is masked
370 conf+=" $(qt_use pch)" 352 conf+=" $(qt_use pch)"
371 353
372 # -reduce-relocations 354 # -reduce-relocations
385 if use_if_iuse glib; then 367 if use_if_iuse glib; then
386 local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)" 368 local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)"
387 # avoid the -pthread argument 369 # avoid the -pthread argument
388 conf+=" ${glibflags//-pthread}" 370 conf+=" ${glibflags//-pthread}"
389 unset glibflags 371 unset glibflags
390 fi
391
392 if use_if_iuse qpa; then
393 echo
394 ewarn "The qpa useflag enables the Qt Platform Abstraction, formely"
395 ewarn "known as Qt Lighthouse. If you are not sure what that is, then"
396 ewarn "disable it before reporting any bugs related to this useflag."
397 echo
398 conf+=" -qpa"
399 fi 372 fi
400 373
401 if use aqua; then 374 if use aqua; then
402 # On (snow) leopard use the new (frameworked) cocoa code. 375 # On (snow) leopard use the new (frameworked) cocoa code.
403 if [[ ${CHOST##*-darwin} -ge 9 ]]; then 376 if [[ ${CHOST##*-darwin} -ge 9 ]]; then
441# @FUNCTION: qt4-build_src_test 414# @FUNCTION: qt4-build_src_test
442# @DESCRIPTION: 415# @DESCRIPTION:
443# Runs tests only in target directories. 416# Runs tests only in target directories.
444qt4-build_src_test() { 417qt4-build_src_test() {
445 # QtMultimedia does not have any test suite (bug #332299) 418 # QtMultimedia does not have any test suite (bug #332299)
446 [[ ${PN} == qt-multimedia ]] && return 419 [[ ${CATEGORY}/${PN} == dev-qt/qtmultimedia ]] && return
447 420
448 for dir in ${QT4_TARGET_DIRECTORIES}; do 421 for dir in ${QT4_TARGET_DIRECTORIES}; do
449 emake -j1 check -C ${dir} 422 emake -j1 check -C ${dir}
450 done 423 done
451} 424}
454# @DESCRIPTION: 427# @DESCRIPTION:
455# For MacOS X we need to add some symlinks when frameworks are 428# For MacOS X we need to add some symlinks when frameworks are
456# being used, to avoid complications with some more or less stupid packages. 429# being used, to avoid complications with some more or less stupid packages.
457fix_includes() { 430fix_includes() {
458 if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then 431 if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
432 local frw dest f h rdir
459 # Some packages tend to include <Qt/...> 433 # Some packages tend to include <Qt/...>
460 dodir "${QTHEADERDIR#${EPREFIX}}"/Qt 434 dodir "${QTHEADERDIR#${EPREFIX}}"/Qt
461 435
462 # Fake normal headers when frameworks are installed... eases life later on 436 # Fake normal headers when frameworks are installed... eases life later
463 local dest f h 437 # on, make sure we use relative links though, as some ebuilds assume
438 # these dirs exist in src_install to add additional files
439 f=${QTHEADERDIR}
440 h=${QTLIBDIR}
441 while [[ -n ${f} && ${f%%/*} == ${h%%/*} ]] ; do
442 f=${f#*/}
443 h=${h#*/}
444 done
445 rdir=${h}
446 f="../"
447 while [[ ${h} == */* ]] ; do
448 f="${f}../"
449 h=${h#*/}
450 done
451 rdir="${f}${rdir}"
452
464 for frw in "${D}${QTLIBDIR}"/*.framework; do 453 for frw in "${D}${QTLIBDIR}"/*.framework; do
465 [[ -e "${frw}"/Headers ]] || continue 454 [[ -e "${frw}"/Headers ]] || continue
466 f=$(basename ${frw}) 455 f=$(basename ${frw})
467 dest="${QTHEADERDIR#${EPREFIX}}"/${f%.framework} 456 dest="${QTHEADERDIR#${EPREFIX}}"/${f%.framework}
468 dosym "${QTLIBDIR#${EPREFIX}}"/${f}/Headers "${dest}" 457 dosym "${rdir}"/${f}/Headers "${dest}"
469 458
470 # Link normal headers as well. 459 # Link normal headers as well.
471 for hdr in "${D}/${QTLIBDIR}/${f}"/Headers/*; do 460 for hdr in "${D}/${QTLIBDIR}/${f}"/Headers/*; do
472 h=$(basename ${hdr}) 461 h=$(basename ${hdr})
473 dosym "${QTLIBDIR#${EPREFIX}}"/${f}/Headers/${h} "${QTHEADERDIR#${EPREFIX}}"/Qt/${h} 462 dosym "../${rdir}"/${f}/Headers/${h} \
463 "${QTHEADERDIR#${EPREFIX}}"/Qt/${h}
474 done 464 done
475 done 465 done
476 fi 466 fi
477} 467}
478 468
479# @FUNCTION: qt4-build_src_install 469# @FUNCTION: qt4-build_src_install
480# @DESCRIPTION: 470# @DESCRIPTION:
481# Perform the actual installation including some library fixes. 471# Perform the actual installation including some library fixes.
482qt4-build_src_install() { 472qt4-build_src_install() {
483 [[ ${EAPI} == 2 ]] && use !prefix && ED=${D}
484 setqtenv 473 setqtenv
485 474
486 install_directories ${QT4_TARGET_DIRECTORIES} 475 install_directories ${QT4_TARGET_DIRECTORIES}
487 install_qconfigs 476 install_qconfigs
488 fix_library_files 477 fix_library_files
489 fix_includes 478 fix_includes
490 479
491 # remove .la files since we are building only shared Qt libraries 480 # remove .la files since we are building only shared libraries
492 find "${D}"${QTLIBDIR} -type f -name '*.la' -print0 | xargs -0 rm -f 481 prune_libtool_files
493} 482}
494 483
495# @FUNCTION: setqtenv 484# @FUNCTION: setqtenv
496# @INTERNAL 485# @INTERNAL
497setqtenv() { 486setqtenv() {
498 # Set up installation directories 487 # Set up installation directories
499 QTPREFIXDIR=${EPREFIX}/usr 488 QTPREFIXDIR=${EPREFIX}/usr
500 QTBINDIR=${EPREFIX}/usr/bin 489 QTBINDIR=${QTPREFIXDIR}/bin
501 QTLIBDIR=${EPREFIX}/usr/$(get_libdir)/qt4 490 QTLIBDIR=${QTPREFIXDIR}/$(get_libdir)/qt4
502 QTPCDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig 491 QTPCDIR=${QTPREFIXDIR}/$(get_libdir)/pkgconfig
503 QTDOCDIR=${EPREFIX}/usr/share/doc/qt-${PV} 492 QTDOCDIR=${QTPREFIXDIR}/share/doc/qt-${PV}
504 QTHEADERDIR=${EPREFIX}/usr/include/qt4 493 QTHEADERDIR=${QTPREFIXDIR}/include/qt4
505 QTPLUGINDIR=${QTLIBDIR}/plugins 494 QTPLUGINDIR=${QTLIBDIR}/plugins
506 QTIMPORTDIR=${QTLIBDIR}/imports 495 QTIMPORTDIR=${QTLIBDIR}/imports
507 QTDATADIR=${EPREFIX}/usr/share/qt4 496 QTDATADIR=${QTPREFIXDIR}/share/qt4
508 QTTRANSDIR=${QTDATADIR}/translations 497 QTTRANSDIR=${QTDATADIR}/translations
509 QTSYSCONFDIR=${EPREFIX}/etc/qt4 498 QTSYSCONFDIR=${EPREFIX}/etc/qt4
510 QTEXAMPLESDIR=${QTDATADIR}/examples 499 QTEXAMPLESDIR=${QTDATADIR}/examples
511 QTDEMOSDIR=${QTDATADIR}/demos 500 QTDEMOSDIR=${QTDATADIR}/demos
512 QMAKE_LIBDIR_QT=${QTLIBDIR} 501 QMAKE_LIBDIR_QT=${QTLIBDIR}
513 QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4
514 502
515 PLATFORM=$(qt_mkspecs_dir) 503 PLATFORM=$(qt_mkspecs_dir)
516
517 unset QMAKESPEC 504 unset QMAKESPEC
505
506 export XDG_CONFIG_HOME="${T}"
518} 507}
519 508
520# @FUNCTION: prepare_directories 509# @FUNCTION: prepare_directories
521# @USAGE: < directories > 510# @USAGE: < directories >
522# @INTERNAL 511# @INTERNAL
524# Generates Makefiles for the given list of directories. 513# Generates Makefiles for the given list of directories.
525prepare_directories() { 514prepare_directories() {
526 for x in "$@"; do 515 for x in "$@"; do
527 pushd "${S}"/${x} >/dev/null || die 516 pushd "${S}"/${x} >/dev/null || die
528 einfo "Running qmake in: ${x}" 517 einfo "Running qmake in: ${x}"
529 # avoid running over the maximum argument number, bug #299810 518 "${S}"/bin/qmake \
530 { 519 "LIBS+=-L${QTLIBDIR}" \
531 echo "${S}"/mkspecs/common/*.conf 520 "CONFIG+=nostrip" \
532 find "${S}" -name '*.pr[io]' 521 || die "qmake failed"
533 } | xargs sed -i \
534 -e "s:\$\$\[QT_INSTALL_LIBS\]:${QTLIBDIR}:g" \
535 -e "s:\$\$\[QT_INSTALL_PLUGINS\]:${QTPLUGINDIR}:g" \
536 || die
537 "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
538 popd >/dev/null || die 522 popd >/dev/null || die
539 done 523 done
540} 524}
541
542 525
543# @FUNCTION: build_directories 526# @FUNCTION: build_directories
544# @USAGE: < directories > 527# @USAGE: < directories >
545# @INTERNAL 528# @INTERNAL
546# @DESCRIPTION: 529# @DESCRIPTION:
547# Compiles the code in the given list of directories. 530# Compiles the code in the given list of directories.
548build_directories() { 531build_directories() {
549 for x in "$@"; do 532 for x in "$@"; do
550 pushd "${S}"/${x} >/dev/null || die 533 pushd "${S}"/${x} >/dev/null || die
534 emake \
535 AR="$(tc-getAR) cqs" \
551 emake CC="$(tc-getCC)" \ 536 CC="$(tc-getCC)" \
552 CXX="$(tc-getCXX)" \ 537 CXX="$(tc-getCXX)" \
553 LINK="$(tc-getCXX)" || die "emake failed" 538 LINK="$(tc-getCXX)" \
539 RANLIB=":" \
540 STRIP=":"
554 popd >/dev/null || die 541 popd >/dev/null || die
555 done 542 done
556} 543}
557 544
558# @FUNCTION: install_directories 545# @FUNCTION: install_directories
561# @DESCRIPTION: 548# @DESCRIPTION:
562# Runs emake install in the given directories, which are separated by spaces. 549# Runs emake install in the given directories, which are separated by spaces.
563install_directories() { 550install_directories() {
564 for x in "$@"; do 551 for x in "$@"; do
565 pushd "${S}"/${x} >/dev/null || die 552 pushd "${S}"/${x} >/dev/null || die
566 emake INSTALL_ROOT="${D}" install || die "emake install failed" 553 emake INSTALL_ROOT="${D}" install
567 popd >/dev/null || die 554 popd >/dev/null || die
568 done 555 done
569} 556}
570 557
571# @ECLASS-VARIABLE: QCONFIG_ADD 558# @ECLASS-VARIABLE: QCONFIG_ADD
592 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then 579 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
593 for x in QCONFIG_ADD QCONFIG_REMOVE; do 580 for x in QCONFIG_ADD QCONFIG_REMOVE; do
594 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri 581 [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
595 done 582 done
596 insinto ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo 583 insinto ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo
597 doins "${T}"/${PN}-qconfig.pri || die "installing ${PN}-qconfig.pri failed" 584 doins "${T}"/${PN}-qconfig.pri
598 fi 585 fi
599 586
600 if [[ -n ${QCONFIG_DEFINE} ]]; then 587 if [[ -n ${QCONFIG_DEFINE} ]]; then
601 for x in ${QCONFIG_DEFINE}; do 588 for x in ${QCONFIG_DEFINE}; do
602 echo "#define ${x}" >> "${T}"/gentoo-${PN}-qconfig.h 589 echo "#define ${x}" >> "${T}"/gentoo-${PN}-qconfig.h
603 done 590 done
604 insinto ${QTHEADERDIR#${EPREFIX}}/Gentoo 591 insinto ${QTHEADERDIR#${EPREFIX}}/Gentoo
605 doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed" 592 doins "${T}"/gentoo-${PN}-qconfig.h
606 fi 593 fi
607} 594}
608 595
609# @FUNCTION: generate_qconfigs 596# @FUNCTION: generate_qconfigs
610# @INTERNAL 597# @INTERNAL
611# @DESCRIPTION: 598# @DESCRIPTION:
612# Generates gentoo-specific qconfig.{h,pri}. 599# Generates gentoo-specific qconfig.{h,pri}.
613generate_qconfigs() { 600generate_qconfigs() {
614 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${PN} == qt-core ]]; then 601 if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == dev-qt/qtcore ]]; then
615 local x qconfig_add qconfig_remove qconfig_new 602 local x qconfig_add qconfig_remove qconfig_new
616 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do 603 for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
617 [[ -f ${x} ]] || continue 604 [[ -f ${x} ]] || continue
618 qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")" 605 qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")"
619 qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")" 606 qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
620 done 607 done
621 608
622 # these error checks do not use die because dying in pkg_post{inst,rm} 609 # these error checks do not use die because dying in pkg_post{inst,rm}
623 # just makes things worse. 610 # just makes things worse.
624 if [[ -e "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri ]]; then 611 if [[ -e "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri ]]; then
625 # start with the qconfig.pri that qt-core installed 612 # start with the qconfig.pri that qtcore installed
626 if ! cp "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri \ 613 if ! cp "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri \
627 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then 614 "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then
628 eerror "cp qconfig failed." 615 eerror "cp qconfig failed."
629 return 1 616 return 1
630 fi 617 fi
682} 669}
683 670
684# @FUNCTION: skip_qmake_build 671# @FUNCTION: skip_qmake_build
685# @INTERNAL 672# @INTERNAL
686# @DESCRIPTION: 673# @DESCRIPTION:
687# Patches configure to skip qmake compilation, as it's already installed by qt-core. 674# Patches configure to skip qmake compilation, as it's already installed by qtcore.
688skip_qmake_build() { 675skip_qmake_build() {
689 sed -i -e "s:if true:if false:g" "${S}"/configure || die 676 sed -i -e "s:if true:if false:g" "${S}"/configure || die
690} 677}
691 678
692# @FUNCTION: skip_project_generation 679# @FUNCTION: skip_project_generation
797 fi 784 fi
798 785
799 echo "${spec}" 786 echo "${spec}"
800} 787}
801 788
802# @FUNCTION: qt_assistant_cleanup
803# @INTERNAL
804# @DESCRIPTION:
805# Tries to clean up tools.pro for qt-assistant ebuilds.
806# Meant to be called in src_prepare().
807# Since Qt 4.7.4 this function is a no-op.
808qt_assistant_cleanup() {
809 # apply patching to qt-assistant ebuilds only
810 [[ ${PN} != qt-assistant ]] && return
811
812 # no longer needed for 4.7.4 and later
813 version_is_at_least 4.7.4 && return
814
815 # different versions (and branches...) may need different handling,
816 # add a case if you need special handling
817 case "${MY_PV_EXTRA}" in
818 *kde-qt*)
819 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \
820 -e "/mac/,/^embedded.*makeqpf$/d" \
821 -i tools/tools.pro || die "patching tools.pro failed"
822 ;;
823 *)
824 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \
825 -e "/mac/,/^embedded.*makeqpf$/d" \
826 -e "s/^\([ \t]*pixeltool\) /\1 qdoc3 /" \
827 -i tools/tools.pro || die "patching tools.pro failed"
828 ;;
829 esac
830}
831
832# @FUNCTION: qt_nolibx11 789# @FUNCTION: qt_nolibx11
833# @INTERNAL 790# @INTERNAL
834# @DESCRIPTION: 791# @DESCRIPTION:
835# Ignore X11 tests for packages that don't need X libraries installed. 792# Skip X11 tests for packages that don't need X libraries installed.
836qt_nolibx11() { 793qt_nolibx11() {
837 sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure || 794 sed -i -e '/^if.*PLATFORM_X11.*CFG_GUI/,/^fi$/d' "${S}"/configure || die
838 die "x11 check sed failed"
839} 795}
840 796
841EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst 797EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst

Legend:
Removed from v.1.123  
changed lines
  Added in v.1.159

  ViewVC Help
Powered by ViewVC 1.1.20