1 |
pesa 12/02/28 18:53:45 |
2 |
|
3 |
Modified: qt4-build.eclass |
4 |
Log: |
5 |
Minor cleanup. |
6 |
|
7 |
Revision Changes Path |
8 |
1.120 eclass/qt4-build.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.120&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.120&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?r1=1.119&r2=1.120 |
13 |
|
14 |
Index: qt4-build.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v |
17 |
retrieving revision 1.119 |
18 |
retrieving revision 1.120 |
19 |
diff -u -r1.119 -r1.120 |
20 |
--- qt4-build.eclass 28 Feb 2012 18:19:29 -0000 1.119 |
21 |
+++ qt4-build.eclass 28 Feb 2012 18:53:45 -0000 1.120 |
22 |
@@ -1,6 +1,6 @@ |
23 |
# Copyright 1999-2012 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.119 2012/02/28 18:19:29 pesa Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.120 2012/02/28 18:53:45 pesa Exp $ |
27 |
|
28 |
# @ECLASS: qt4-build.eclass |
29 |
# @MAINTAINER: |
30 |
@@ -198,7 +198,7 @@ |
31 |
symlink_binaries_to_buildtree |
32 |
fi |
33 |
|
34 |
- if [[ ${CHOST} == *86*-apple-darwin* ]] ; then |
35 |
+ if [[ ${CHOST} == *86*-apple-darwin* ]]; then |
36 |
# qmake bus errors with -O2 but -O3 works |
37 |
replace-flags -O2 -O3 |
38 |
fi |
39 |
@@ -219,7 +219,7 @@ |
40 |
fi |
41 |
|
42 |
# Unsupported old gcc versions - hardened needs this :( |
43 |
- if [[ $(gcc-major-version) -lt 4 ]] ; then |
44 |
+ if [[ $(gcc-major-version) -lt 4 ]]; then |
45 |
ewarn "Appending -fno-stack-protector to CXXFLAGS" |
46 |
append-cxxflags -fno-stack-protector |
47 |
# Bug 253127 |
48 |
@@ -284,7 +284,7 @@ |
49 |
|| die "sed -arch/-Xarch failed" |
50 |
|
51 |
# On Snow Leopard don't fall back to 10.5 deployment target. |
52 |
- if [[ ${CHOST} == *-apple-darwin10 ]] ; then |
53 |
+ if [[ ${CHOST} == *-apple-darwin10 ]]; then |
54 |
sed -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \ |
55 |
-e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \ |
56 |
-i configure mkspecs/common/mac-g++.conf \ |
57 |
@@ -294,7 +294,7 @@ |
58 |
|
59 |
# this one is needed for all systems with a separate -liconv, apart from |
60 |
# Darwin, for which the sources already cater for -liconv |
61 |
- if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] ; then |
62 |
+ if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then |
63 |
sed -e 's|mac:\(LIBS += -liconv\)|\1|g' \ |
64 |
-i config.tests/unix/iconv/iconv.pro \ |
65 |
|| die "sed iconv.pro failed" |
66 |
@@ -321,11 +321,11 @@ |
67 |
|
68 |
# this one is needed for all systems with a separate -liconv, apart from |
69 |
# Darwin, for which the sources already cater for -liconv |
70 |
- use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \ |
71 |
+ if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then |
72 |
myconf+=" -liconv" |
73 |
+ fi |
74 |
|
75 |
if use_if_iuse glib; then |
76 |
- # use -I, -L and -l from configure |
77 |
local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)" |
78 |
# avoid the -pthread argument |
79 |
myconf+=" ${glibflags//-pthread}" |
80 |
@@ -341,22 +341,22 @@ |
81 |
myconf+=" -qpa" |
82 |
fi |
83 |
|
84 |
- if use aqua ; then |
85 |
+ if use aqua; then |
86 |
# On (snow) leopard use the new (frameworked) cocoa code. |
87 |
- if [[ ${CHOST##*-darwin} -ge 9 ]] ; then |
88 |
+ if [[ ${CHOST##*-darwin} -ge 9 ]]; then |
89 |
myconf+=" -cocoa -framework" |
90 |
+ # We need the source's headers, not the installed ones. |
91 |
+ myconf+=" -I${S}/include" |
92 |
+ # Add hint for the framework location. |
93 |
+ myconf+=" -F${QTLIBDIR}" |
94 |
|
95 |
# We are crazy and build cocoa + qt3support :-) |
96 |
if use qt3support; then |
97 |
sed -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \ |
98 |
-i configure || die |
99 |
fi |
100 |
- |
101 |
- # We need the source's headers, not the installed ones. |
102 |
- myconf+=" -I${S}/include" |
103 |
- |
104 |
- # Add hint for the framework location. |
105 |
- myconf+=" -F${QTLIBDIR}" |
106 |
+ else |
107 |
+ myconf+=" -no-framework" |
108 |
fi |
109 |
else |
110 |
# freetype2 include dir is non-standard, thus include it on configure |
111 |
@@ -397,7 +397,7 @@ |
112 |
# For MacOS X we need to add some symlinks when frameworks are |
113 |
# being used, to avoid complications with some more or less stupid packages. |
114 |
fix_includes() { |
115 |
- if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then |
116 |
+ if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then |
117 |
# Some packages tend to include <Qt/...> |
118 |
dodir "${QTHEADERDIR#${EPREFIX}}"/Qt |
119 |
|
120 |
@@ -465,7 +465,8 @@ |
121 |
# Sets up some standard configure options, like libdir (if necessary), whether |
122 |
# debug info is wanted or not. |
123 |
standard_configure_options() { |
124 |
- local myconf="-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} |
125 |
+ local myconf=" |
126 |
+ -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} |
127 |
-docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} |
128 |
$(version_is_at_least 4.7 && echo -importdir ${QTIMPORTDIR}) |
129 |
-datadir ${QTDATADIR} -translationdir ${QTTRANSDIR} -sysconfdir ${QTSYSCONFDIR} |
130 |
@@ -484,9 +485,7 @@ |
131 |
myconf+=" -no-separate-debug-info" |
132 |
|
133 |
# exceptions USE flag |
134 |
- local exceptions="-exceptions" |
135 |
- in_iuse exceptions && exceptions="$(qt_use exceptions)" |
136 |
- myconf+=" ${exceptions}" |
137 |
+ myconf+=" $(in_iuse exceptions && qt_use exceptions || echo -exceptions)" |
138 |
|
139 |
# disable RPATH on Qt >= 4.8 (bug 380415) |
140 |
version_is_at_least 4.8 && myconf+=" -no-rpath" |
141 |
@@ -501,8 +500,6 @@ |
142 |
# -- Daniel Vergien |
143 |
[[ ${CHOST} != *-solaris* ]] && myconf+=" -reduce-relocations" |
144 |
|
145 |
- use aqua && myconf+=" -no-framework" |
146 |
- |
147 |
# ARCH is set on Gentoo. Qt now falls back to generic on an unsupported |
148 |
# $(tc-arch). Therefore we convert it to supported values. |
149 |
case "$(tc-arch)" in |