| 1 |
pesa 15/05/31 13:56:53 |
| 2 |
|
| 3 |
Modified: ChangeLog qt4-build-multilib.eclass |
| 4 |
Log: |
| 5 |
Blacklist graphite-related flags that cause ICEs on qtwebkit (bug 550780). |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1633 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1633&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1633&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1632&r2=1.1633 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1632 |
| 18 |
retrieving revision 1.1633 |
| 19 |
diff -u -r1.1632 -r1.1633 |
| 20 |
--- ChangeLog 31 May 2015 10:11:35 -0000 1.1632 |
| 21 |
+++ ChangeLog 31 May 2015 13:56:53 -0000 1.1633 |
| 22 |
@@ -1,6 +1,9 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1632 2015/05/31 10:11:35 perfinion Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1633 2015/05/31 13:56:53 pesa Exp $ |
| 27 |
+ |
| 28 |
+ 31 May 2015; Davide Pesavento <pesa@g.o> qt4-build-multilib.eclass: |
| 29 |
+ Blacklist graphite-related flags that cause ICEs on qtwebkit (bug 550780). |
| 30 |
|
| 31 |
31 May 2015; Jason Zaman <perfinion@g.o> kde4-base.eclass, kde5.eclass: |
| 32 |
KDE: fix SELinux deps, bug 550824 |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.16 eclass/qt4-build-multilib.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.16&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.16&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.15&r2=1.16 |
| 41 |
|
| 42 |
Index: qt4-build-multilib.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v |
| 45 |
retrieving revision 1.15 |
| 46 |
retrieving revision 1.16 |
| 47 |
diff -u -r1.15 -r1.16 |
| 48 |
--- qt4-build-multilib.eclass 10 May 2015 14:27:29 -0000 1.15 |
| 49 |
+++ qt4-build-multilib.eclass 31 May 2015 13:56:53 -0000 1.16 |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
# Copyright 1999-2015 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.15 2015/05/10 14:27:29 pesa Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.16 2015/05/31 13:56:53 pesa Exp $ |
| 55 |
|
| 56 |
# @ECLASS: qt4-build-multilib.eclass |
| 57 |
# @MAINTAINER: |
| 58 |
@@ -154,20 +154,6 @@ |
| 59 |
|| die "sed failed (skip X11 tests)" |
| 60 |
fi |
| 61 |
|
| 62 |
- if use_if_iuse aqua; then |
| 63 |
- sed -i \ |
| 64 |
- -e '/^CONFIG/s:app_bundle::' \ |
| 65 |
- -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \ |
| 66 |
- mkspecs/$(qt4_get_mkspec)/qmake.conf \ |
| 67 |
- || die "sed failed (aqua)" |
| 68 |
- |
| 69 |
- # we are crazy and build cocoa + qt3support |
| 70 |
- if { ! in_iuse qt3support || use qt3support; } && [[ ${CHOST##*-darwin} -ge 9 ]]; then |
| 71 |
- sed -i -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \ |
| 72 |
- configure || die "sed failed (cocoa + qt3support)" |
| 73 |
- fi |
| 74 |
- fi |
| 75 |
- |
| 76 |
if [[ ${PN} == qtcore ]]; then |
| 77 |
# Bug 373061 |
| 78 |
# qmake bus errors with -O2 or -O3 but -O1 works |
| 79 |
@@ -182,6 +168,11 @@ |
| 80 |
fi |
| 81 |
fi |
| 82 |
|
| 83 |
+ if [[ ${PN} == qtwebkit ]]; then |
| 84 |
+ # Bug 550780 |
| 85 |
+ filter-flags -fgraphite-identity -floop-strip-mine |
| 86 |
+ fi |
| 87 |
+ |
| 88 |
# Bug 261632 |
| 89 |
if use ppc64; then |
| 90 |
append-flags -mminimal-toc |
| 91 |
@@ -220,6 +211,20 @@ |
| 92 |
mkspecs/$(qt4_get_mkspec)/qmake.conf \ |
| 93 |
|| die "sed QMAKE_(LIB|INC)DIR failed" |
| 94 |
|
| 95 |
+ if use_if_iuse aqua; then |
| 96 |
+ sed -i \ |
| 97 |
+ -e '/^CONFIG/s:app_bundle::' \ |
| 98 |
+ -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \ |
| 99 |
+ mkspecs/$(qt4_get_mkspec)/qmake.conf \ |
| 100 |
+ || die "sed failed (aqua)" |
| 101 |
+ |
| 102 |
+ # we are crazy and build cocoa + qt3support |
| 103 |
+ if { ! in_iuse qt3support || use qt3support; } && [[ ${CHOST##*-darwin} -ge 9 ]]; then |
| 104 |
+ sed -i -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \ |
| 105 |
+ configure || die "sed failed (cocoa + qt3support)" |
| 106 |
+ fi |
| 107 |
+ fi |
| 108 |
+ |
| 109 |
if [[ ${CHOST} == *-darwin* ]]; then |
| 110 |
# Set FLAGS and remove -arch, since our gcc-apple is multilib crippled (by design) |
| 111 |
sed -i \ |
Archives