1 |
pesa 12/03/01 15:06:00 |
2 |
|
3 |
Modified: ChangeLog qt4-build.eclass |
4 |
Log: |
5 |
Fold standard_configure_options() into qt4-build_src_configure(). |
6 |
|
7 |
Revision Changes Path |
8 |
1.149 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.149&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.149&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.148&r2=1.149 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.148 |
18 |
retrieving revision 1.149 |
19 |
diff -u -r1.148 -r1.149 |
20 |
--- ChangeLog 1 Mar 2012 07:00:40 -0000 1.148 |
21 |
+++ ChangeLog 1 Mar 2012 15:06:00 -0000 1.149 |
22 |
@@ -1,6 +1,9 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.148 2012/03/01 07:00:40 ulm Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.149 2012/03/01 15:06:00 pesa Exp $ |
27 |
+ |
28 |
+ 01 Mar 2012; Davide Pesavento <pesa@g.o> qt4-build.eclass: |
29 |
+ Fold standard_configure_options() into qt4-build_src_configure(). |
30 |
|
31 |
01 Mar 2012; Ulrich Müller <ulm@g.o> eutils.eclass: |
32 |
Cdrom functions split out to dedicated cdrom.eclass. |
33 |
|
34 |
|
35 |
|
36 |
1.121 eclass/qt4-build.eclass |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.121&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.121&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?r1=1.120&r2=1.121 |
41 |
|
42 |
Index: qt4-build.eclass |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v |
45 |
retrieving revision 1.120 |
46 |
retrieving revision 1.121 |
47 |
diff -u -r1.120 -r1.121 |
48 |
--- qt4-build.eclass 28 Feb 2012 18:53:45 -0000 1.120 |
49 |
+++ qt4-build.eclass 1 Mar 2012 15:06:00 -0000 1.121 |
50 |
@@ -1,6 +1,6 @@ |
51 |
# Copyright 1999-2012 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.120 2012/02/28 18:53:45 pesa Exp $ |
54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.121 2012/03/01 15:06:00 pesa Exp $ |
55 |
|
56 |
# @ECLASS: qt4-build.eclass |
57 |
# @MAINTAINER: |
58 |
@@ -317,18 +317,76 @@ |
59 |
# Default configure phase |
60 |
qt4-build_src_configure() { |
61 |
setqtenv |
62 |
- myconf="$(standard_configure_options) ${myconf}" |
63 |
+ |
64 |
+ local conf=" |
65 |
+ -prefix ${QTPREFIXDIR} |
66 |
+ -bindir ${QTBINDIR} |
67 |
+ -libdir ${QTLIBDIR} |
68 |
+ -docdir ${QTDOCDIR} |
69 |
+ -headerdir ${QTHEADERDIR} |
70 |
+ -plugindir ${QTPLUGINDIR} |
71 |
+ $(version_is_at_least 4.7 && echo -importdir ${QTIMPORTDIR}) |
72 |
+ -datadir ${QTDATADIR} |
73 |
+ -translationdir ${QTTRANSDIR} |
74 |
+ -sysconfdir ${QTSYSCONFDIR} |
75 |
+ -examplesdir ${QTEXAMPLESDIR} |
76 |
+ -demosdir ${QTDEMOSDIR} |
77 |
+ -opensource -confirm-license |
78 |
+ -shared -fast -largefile -stl -verbose |
79 |
+ -nomake examples -nomake demos" |
80 |
+ |
81 |
+ # ARCH is set on Gentoo. Qt now falls back to generic on an unsupported |
82 |
+ # $(tc-arch). Therefore we convert it to supported values. |
83 |
+ case "$(tc-arch)" in |
84 |
+ amd64|x64-*) conf+=" -arch x86_64" ;; |
85 |
+ ppc-macos) conf+=" -arch ppc" ;; |
86 |
+ ppc|ppc64|ppc-*) conf+=" -arch powerpc" ;; |
87 |
+ sparc|sparc-*|sparc64-*) conf+=" -arch sparc" ;; |
88 |
+ x86-macos) conf+=" -arch x86" ;; |
89 |
+ x86|x86-*) conf+=" -arch i386" ;; |
90 |
+ alpha|arm|ia64|mips|s390) conf+=" -arch $(tc-arch)" ;; |
91 |
+ hppa|sh) conf+=" -arch generic" ;; |
92 |
+ *) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;; |
93 |
+ esac |
94 |
+ |
95 |
+ conf+=" -platform $(qt_mkspecs_dir)" |
96 |
+ |
97 |
+ [[ $(get_libdir) != lib ]] && conf+=" -L${EPREFIX}/usr/$(get_libdir)" |
98 |
+ |
99 |
+ # debug/release |
100 |
+ if use debug; then |
101 |
+ conf+=" -debug" |
102 |
+ else |
103 |
+ conf+=" -release" |
104 |
+ fi |
105 |
+ conf+=" -no-separate-debug-info" |
106 |
+ |
107 |
+ # exceptions USE flag |
108 |
+ conf+=" $(in_iuse exceptions && qt_use exceptions || echo -exceptions)" |
109 |
+ |
110 |
+ # disable RPATH on Qt >= 4.8 (bug 380415) |
111 |
+ version_is_at_least 4.8 && conf+=" -no-rpath" |
112 |
+ |
113 |
+ # precompiled headers don't work on hardened, where the flag is masked |
114 |
+ conf+=" $(qt_use pch)" |
115 |
+ |
116 |
+ # -reduce-relocations |
117 |
+ # This flag seems to introduce major breakage to applications, |
118 |
+ # mostly to be seen as a core dump with the message "QPixmap: Must |
119 |
+ # construct a QApplication before a QPaintDevice" on Solaris. |
120 |
+ # -- Daniel Vergien |
121 |
+ [[ ${CHOST} != *-solaris* ]] && conf+=" -reduce-relocations" |
122 |
|
123 |
# this one is needed for all systems with a separate -liconv, apart from |
124 |
# Darwin, for which the sources already cater for -liconv |
125 |
if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then |
126 |
- myconf+=" -liconv" |
127 |
+ conf+=" -liconv" |
128 |
fi |
129 |
|
130 |
if use_if_iuse glib; then |
131 |
local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)" |
132 |
# avoid the -pthread argument |
133 |
- myconf+=" ${glibflags//-pthread}" |
134 |
+ conf+=" ${glibflags//-pthread}" |
135 |
unset glibflags |
136 |
fi |
137 |
|
138 |
@@ -338,17 +396,17 @@ |
139 |
ewarn "known as Qt Lighthouse. If you are not sure what that is, then" |
140 |
ewarn "disable it before reporting any bugs related to this useflag." |
141 |
ewarn |
142 |
- myconf+=" -qpa" |
143 |
+ conf+=" -qpa" |
144 |
fi |
145 |
|
146 |
if use aqua; then |
147 |
# On (snow) leopard use the new (frameworked) cocoa code. |
148 |
if [[ ${CHOST##*-darwin} -ge 9 ]]; then |
149 |
- myconf+=" -cocoa -framework" |
150 |
+ conf+=" -cocoa -framework" |
151 |
# We need the source's headers, not the installed ones. |
152 |
- myconf+=" -I${S}/include" |
153 |
+ conf+=" -I${S}/include" |
154 |
# Add hint for the framework location. |
155 |
- myconf+=" -F${QTLIBDIR}" |
156 |
+ conf+=" -F${QTLIBDIR}" |
157 |
|
158 |
# We are crazy and build cocoa + qt3support :-) |
159 |
if use qt3support; then |
160 |
@@ -356,17 +414,18 @@ |
161 |
-i configure || die |
162 |
fi |
163 |
else |
164 |
- myconf+=" -no-framework" |
165 |
+ conf+=" -no-framework" |
166 |
fi |
167 |
else |
168 |
- # freetype2 include dir is non-standard, thus include it on configure |
169 |
- # use -I from configure |
170 |
- myconf+=" $(pkg-config --cflags freetype2)" |
171 |
+ # freetype2 include dir is non-standard, thus pass it to configure |
172 |
+ conf+=" $(pkg-config --cflags-only-I freetype2)" |
173 |
fi |
174 |
|
175 |
- echo ./configure ${myconf} |
176 |
- ./configure ${myconf} || die "./configure failed" |
177 |
- myconf="" |
178 |
+ conf+=" ${myconf}" |
179 |
+ myconf= |
180 |
+ |
181 |
+ echo ./configure ${conf} |
182 |
+ ./configure ${conf} || die "./configure failed" |
183 |
|
184 |
prepare_directories ${QT4_TARGET_DIRECTORIES} |
185 |
} |
186 |
@@ -459,64 +518,6 @@ |
187 |
unset QMAKESPEC |
188 |
} |
189 |
|
190 |
-# @FUNCTION: standard_configure_options |
191 |
-# @INTERNAL |
192 |
-# @DESCRIPTION: |
193 |
-# Sets up some standard configure options, like libdir (if necessary), whether |
194 |
-# debug info is wanted or not. |
195 |
-standard_configure_options() { |
196 |
- local myconf=" |
197 |
- -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} |
198 |
- -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} |
199 |
- $(version_is_at_least 4.7 && echo -importdir ${QTIMPORTDIR}) |
200 |
- -datadir ${QTDATADIR} -translationdir ${QTTRANSDIR} -sysconfdir ${QTSYSCONFDIR} |
201 |
- -examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} |
202 |
- -opensource -confirm-license -shared -fast -largefile -stl -verbose |
203 |
- -platform $(qt_mkspecs_dir) -nomake examples -nomake demos" |
204 |
- |
205 |
- [[ $(get_libdir) != lib ]] && myconf+=" -L${EPREFIX}/usr/$(get_libdir)" |
206 |
- |
207 |
- # debug/release |
208 |
- if use debug; then |
209 |
- myconf+=" -debug" |
210 |
- else |
211 |
- myconf+=" -release" |
212 |
- fi |
213 |
- myconf+=" -no-separate-debug-info" |
214 |
- |
215 |
- # exceptions USE flag |
216 |
- myconf+=" $(in_iuse exceptions && qt_use exceptions || echo -exceptions)" |
217 |
- |
218 |
- # disable RPATH on Qt >= 4.8 (bug 380415) |
219 |
- version_is_at_least 4.8 && myconf+=" -no-rpath" |
220 |
- |
221 |
- # precompiled headers don't work on hardened, where the flag is masked |
222 |
- myconf+=" $(qt_use pch)" |
223 |
- |
224 |
- # -reduce-relocations |
225 |
- # This flag seems to introduce major breakage to applications, |
226 |
- # mostly to be seen as a core dump with the message "QPixmap: Must |
227 |
- # construct a QApplication before a QPaintDevice" on Solaris. |
228 |
- # -- Daniel Vergien |
229 |
- [[ ${CHOST} != *-solaris* ]] && myconf+=" -reduce-relocations" |
230 |
- |
231 |
- # ARCH is set on Gentoo. Qt now falls back to generic on an unsupported |
232 |
- # $(tc-arch). Therefore we convert it to supported values. |
233 |
- case "$(tc-arch)" in |
234 |
- amd64|x64-*) myconf+=" -arch x86_64" ;; |
235 |
- ppc-macos) myconf+=" -arch ppc" ;; |
236 |
- ppc|ppc64|ppc-*) myconf+=" -arch powerpc" ;; |
237 |
- sparc|sparc-*|sparc64-*) myconf+=" -arch sparc" ;; |
238 |
- x86-macos) myconf+=" -arch x86" ;; |
239 |
- x86|x86-*) myconf+=" -arch i386" ;; |
240 |
- alpha|arm|ia64|mips|s390) myconf+=" -arch $(tc-arch)" ;; |
241 |
- hppa|sh) myconf+=" -arch generic" ;; |
242 |
- *) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;; |
243 |
- esac |
244 |
- |
245 |
- echo "${myconf}" |
246 |
-} |
247 |
- |
248 |
# @FUNCTION: prepare_directories |
249 |
# @USAGE: < directories > |
250 |
# @INTERNAL |