| 1 |
pesa 11/12/21 23:38:45 |
| 2 |
|
| 3 |
Modified: qt4-build.eclass |
| 4 |
Log: |
| 5 |
Cleanup and sort flags in standard_configure_options(), no functional changes. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.107 eclass/qt4-build.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.107&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.107&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?r1=1.106&r2=1.107 |
| 13 |
|
| 14 |
Index: qt4-build.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v |
| 17 |
retrieving revision 1.106 |
| 18 |
retrieving revision 1.107 |
| 19 |
diff -u -r1.106 -r1.107 |
| 20 |
--- qt4-build.eclass 21 Dec 2011 22:47:35 -0000 1.106 |
| 21 |
+++ qt4-build.eclass 21 Dec 2011 23:38:45 -0000 1.107 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2011 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.106 2011/12/21 22:47:35 pesa Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.107 2011/12/21 23:38:45 pesa Exp $ |
| 27 |
|
| 28 |
# @ECLASS: qt4-build.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -463,18 +463,16 @@ |
| 31 |
# Sets up some standard configure options, like libdir (if necessary), whether |
| 32 |
# debug info is wanted or not. |
| 33 |
standard_configure_options() { |
| 34 |
- local myconf= |
| 35 |
+ local myconf="-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} |
| 36 |
+ -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} |
| 37 |
+ -importdir ${QTIMPORTDIR} -datadir ${QTDATADIR} -translationdir ${QTTRANSDIR} |
| 38 |
+ -sysconfdir ${QTSYSCONFDIR} -examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} |
| 39 |
+ -opensource -confirm-license -shared -fast -largefile -stl -verbose |
| 40 |
+ -platform $(qt_mkspecs_dir) -nomake examples -nomake demos" |
| 41 |
|
| 42 |
[[ $(get_libdir) != lib ]] && myconf+=" -L${EPREFIX}/usr/$(get_libdir)" |
| 43 |
|
| 44 |
- # Disable visibility explicitly if gcc version isn't 4 |
| 45 |
- if [[ $(gcc-major-version) -lt 4 ]]; then |
| 46 |
- myconf+=" -no-reduce-exports" |
| 47 |
- fi |
| 48 |
- |
| 49 |
- # precompiled headers doesn't work on hardened, where the flag is masked. |
| 50 |
- myconf+=" $(qt_use pch)" |
| 51 |
- |
| 52 |
+ # debug/release |
| 53 |
if use debug; then |
| 54 |
myconf+=" -debug" |
| 55 |
else |
| 56 |
@@ -482,6 +480,24 @@ |
| 57 |
fi |
| 58 |
myconf+=" -no-separate-debug-info" |
| 59 |
|
| 60 |
+ # exceptions USE flag |
| 61 |
+ local exceptions="-exceptions" |
| 62 |
+ in_iuse exceptions && exceptions="$(qt_use exceptions)" |
| 63 |
+ myconf+=" ${exceptions}" |
| 64 |
+ |
| 65 |
+ # disable RPATH on Qt >= 4.8 (bug 380415) |
| 66 |
+ version_is_at_least 4.8 && myconf+=" -no-rpath" |
| 67 |
+ |
| 68 |
+ # precompiled headers don't work on hardened, where the flag is masked |
| 69 |
+ myconf+=" $(qt_use pch)" |
| 70 |
+ |
| 71 |
+ # -reduce-relocations |
| 72 |
+ # This flag seems to introduce major breakage to applications, |
| 73 |
+ # mostly to be seen as a core dump with the message "QPixmap: Must |
| 74 |
+ # construct a QApplication before a QPaintDevice" on Solaris. |
| 75 |
+ # -- Daniel Vergien |
| 76 |
+ [[ ${CHOST} != *-solaris* ]] && myconf+=" -reduce-relocations" |
| 77 |
+ |
| 78 |
use aqua && myconf+=" -no-framework" |
| 79 |
|
| 80 |
# ARCH is set on Gentoo. Qt now falls back to generic on an unsupported |
| 81 |
@@ -498,29 +514,6 @@ |
| 82 |
*) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;; |
| 83 |
esac |
| 84 |
|
| 85 |
- # exceptions USE flag |
| 86 |
- local exceptions="-exceptions" |
| 87 |
- in_iuse exceptions && exceptions="$(qt_use exceptions)" |
| 88 |
- |
| 89 |
- # bug 380415 |
| 90 |
- version_is_at_least 4.8 && myconf+=" -no-rpath" |
| 91 |
- |
| 92 |
- # note about -reduce-relocations: |
| 93 |
- # That flag seems to introduce major breakage to applications, |
| 94 |
- # mostly to be seen as a core dump with the message "QPixmap: Must |
| 95 |
- # construct a QApplication before a QPaintDevice" on Solaris |
| 96 |
- # -- Daniel Vergien |
| 97 |
- [[ ${CHOST} != *-solaris* ]] && myconf+=" -reduce-relocations" |
| 98 |
- |
| 99 |
- myconf+=" -platform $(qt_mkspecs_dir) -stl -verbose -largefile -confirm-license |
| 100 |
- -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} |
| 101 |
- -datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} |
| 102 |
- -plugindir ${QTPLUGINDIR} -sysconfdir ${QTSYSCONFDIR} |
| 103 |
- -translationdir ${QTTRANSDIR} -examplesdir ${QTEXAMPLESDIR} |
| 104 |
- -demosdir ${QTDEMOSDIR} -importdir ${QTIMPORTDIR} -silent -fast -opensource |
| 105 |
- ${exceptions} |
| 106 |
- -nomake examples -nomake demos" |
| 107 |
- |
| 108 |
echo "${myconf}" |
| 109 |
} |
Archives