| 1 |
hwoarang 11/10/30 14:21:14 |
| 2 |
|
| 3 |
Modified: qt4-build.eclass |
| 4 |
Log: |
| 5 |
add support for qpa and c++0x use flags for Qt-4.8. patch ack'd by tampakrap |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.96 eclass/qt4-build.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.96&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.96&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?r1=1.95&r2=1.96 |
| 13 |
|
| 14 |
Index: qt4-build.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v |
| 17 |
retrieving revision 1.95 |
| 18 |
retrieving revision 1.96 |
| 19 |
diff -u -r1.95 -r1.96 |
| 20 |
--- qt4-build.eclass 16 Oct 2011 09:59:39 -0000 1.95 |
| 21 |
+++ qt4-build.eclass 30 Oct 2011 14:21:14 -0000 1.96 |
| 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.95 2011/10/16 09:59:39 hwoarang Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.96 2011/10/30 14:21:14 hwoarang Exp $ |
| 27 |
|
| 28 |
# @ECLASS: qt4-build.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -24,6 +24,10 @@ |
| 31 |
MY_P=qt-x11-opensource-src-${MY_PV} |
| 32 |
fi |
| 33 |
|
| 34 |
+if version_is_at_least 4.7.99999999; then |
| 35 |
+ IUSE+=" c++0x qpa" |
| 36 |
+fi |
| 37 |
+ |
| 38 |
HOMEPAGE="http://qt.nokia.com/" |
| 39 |
SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz" |
| 40 |
|
| 41 |
@@ -209,13 +213,21 @@ |
| 42 |
# qmake bus errors with -O2 but -O3 works |
| 43 |
replace-flags -O2 -O3 |
| 44 |
fi |
| 45 |
- |
| 46 |
+ |
| 47 |
# Bug 178652 |
| 48 |
if [[ $(gcc-major-version) == 3 ]] && use amd64; then |
| 49 |
ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS" |
| 50 |
append-flags -fno-gcse |
| 51 |
fi |
| 52 |
|
| 53 |
+ if has c++0x ${IUSE//+} && use c++0x; then |
| 54 |
+ ewarn "You are about to build Qt4 using the C++11 standard. Even though" |
| 55 |
+ ewarn "this is an official standard, some of the reverse dependencies" |
| 56 |
+ ewarn "may fail to compile or link againt the Qt4 libraries. Before" |
| 57 |
+ ewarn "reporting a bug, make sure your bug is reproducible with c++0x" |
| 58 |
+ ewarn "disabled." |
| 59 |
+ append-flags -std=c++0x |
| 60 |
+ fi |
| 61 |
# Unsupported old gcc versions - hardened needs this :( |
| 62 |
if [[ $(gcc-major-version) -lt 4 ]] ; then |
| 63 |
ewarn "Appending -fno-stack-protector to CXXFLAGS" |
| 64 |
@@ -322,6 +334,15 @@ |
| 65 |
unset glibflags |
| 66 |
fi |
| 67 |
|
| 68 |
+ if has qpa ${IUSE//+} && use qpa; then |
| 69 |
+ ewarn |
| 70 |
+ ewarn "The qpa useflag enables the Qt Platform Abstraction, formely" |
| 71 |
+ ewarn "known as Qt Lighthouse. If you are not sure what that is, then" |
| 72 |
+ ewarn "disable it before reporting any bugs related to this useflag." |
| 73 |
+ ewarn |
| 74 |
+ myconf+=" -qpa" |
| 75 |
+ fi |
| 76 |
+ |
| 77 |
if use aqua ; then |
| 78 |
# On (snow) leopard use the new (frameworked) cocoa code. |
| 79 |
if [[ ${CHOST##*-darwin} -ge 9 ]] ; then |
Archives