| 1 |
commit: 8f2e955183ee5287518b8f28fe9a4ba09e0d0e82 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 31 14:12:53 2015 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 31 14:12:53 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=8f2e9551 |
| 7 |
|
| 8 |
[qt4-build-multilib.eclass] Sync. |
| 9 |
|
| 10 |
eclass/qt4-build-multilib.eclass | 33 +++++++++++++++++++-------------- |
| 11 |
1 file changed, 19 insertions(+), 14 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass |
| 14 |
index a244484..245c020 100644 |
| 15 |
--- a/eclass/qt4-build-multilib.eclass |
| 16 |
+++ b/eclass/qt4-build-multilib.eclass |
| 17 |
@@ -154,20 +154,6 @@ qt4-build-multilib_src_prepare() { |
| 18 |
|| die "sed failed (skip X11 tests)" |
| 19 |
fi |
| 20 |
|
| 21 |
- if use_if_iuse aqua; then |
| 22 |
- sed -i \ |
| 23 |
- -e '/^CONFIG/s:app_bundle::' \ |
| 24 |
- -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \ |
| 25 |
- mkspecs/$(qt4_get_mkspec)/qmake.conf \ |
| 26 |
- || die "sed failed (aqua)" |
| 27 |
- |
| 28 |
- # we are crazy and build cocoa + qt3support |
| 29 |
- if { ! in_iuse qt3support || use qt3support; } && [[ ${CHOST##*-darwin} -ge 9 ]]; then |
| 30 |
- sed -i -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \ |
| 31 |
- configure || die "sed failed (cocoa + qt3support)" |
| 32 |
- fi |
| 33 |
- fi |
| 34 |
- |
| 35 |
if [[ ${PN} == qtcore ]]; then |
| 36 |
# Bug 373061 |
| 37 |
# qmake bus errors with -O2 or -O3 but -O1 works |
| 38 |
@@ -182,6 +168,11 @@ qt4-build-multilib_src_prepare() { |
| 39 |
fi |
| 40 |
fi |
| 41 |
|
| 42 |
+ if [[ ${PN} == qtwebkit ]]; then |
| 43 |
+ # Bug 550780 |
| 44 |
+ filter-flags -fgraphite-identity -floop-strip-mine |
| 45 |
+ fi |
| 46 |
+ |
| 47 |
# Bug 261632 |
| 48 |
if use ppc64; then |
| 49 |
append-flags -mminimal-toc |
| 50 |
@@ -220,6 +211,20 @@ qt4-build-multilib_src_prepare() { |
| 51 |
mkspecs/$(qt4_get_mkspec)/qmake.conf \ |
| 52 |
|| die "sed QMAKE_(LIB|INC)DIR failed" |
| 53 |
|
| 54 |
+ if use_if_iuse aqua; then |
| 55 |
+ sed -i \ |
| 56 |
+ -e '/^CONFIG/s:app_bundle::' \ |
| 57 |
+ -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \ |
| 58 |
+ mkspecs/$(qt4_get_mkspec)/qmake.conf \ |
| 59 |
+ || die "sed failed (aqua)" |
| 60 |
+ |
| 61 |
+ # we are crazy and build cocoa + qt3support |
| 62 |
+ if { ! in_iuse qt3support || use qt3support; } && [[ ${CHOST##*-darwin} -ge 9 ]]; then |
| 63 |
+ sed -i -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \ |
| 64 |
+ configure || die "sed failed (cocoa + qt3support)" |
| 65 |
+ fi |
| 66 |
+ fi |
| 67 |
+ |
| 68 |
if [[ ${CHOST} == *-darwin* ]]; then |
| 69 |
# Set FLAGS and remove -arch, since our gcc-apple is multilib crippled (by design) |
| 70 |
sed -i \ |
Archives