| 1 |
yngwin 10/02/10 20:34:17 |
| 2 |
|
| 3 |
Modified: qt4-build.eclass |
| 4 |
Log: |
| 5 |
Small patch to fix Darwinbuild issues with qt4-build.eclass |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.63 eclass/qt4-build.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.63&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.63&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.62&r2=1.63 |
| 13 |
|
| 14 |
Index: qt4-build.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v |
| 17 |
retrieving revision 1.62 |
| 18 |
retrieving revision 1.63 |
| 19 |
diff -u -r1.62 -r1.63 |
| 20 |
--- qt4-build.eclass 21 Jan 2010 05:57:09 -0000 1.62 |
| 21 |
+++ qt4-build.eclass 10 Feb 2010 20:34:17 -0000 1.63 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2009 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.62 2010/01/21 05:57:09 vapier Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.63 2010/02/10 20:34:17 yngwin Exp $ |
| 27 |
|
| 28 |
# @ECLASS: qt4-build.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -72,15 +72,11 @@ |
| 31 |
LD_LIBRARY_PATH="${S}/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}" |
| 32 |
else |
| 33 |
DYLD_LIBRARY_PATH="${S}/lib${DYLD_LIBRARY_PATH:+:}${DYLD_LIBRARY_PATH}" |
| 34 |
- # on mac we *need* src/gui/kernel/qapplication_mac.cpp for platfrom |
| 35 |
- # detection since the x11-headers package b0rkens the header |
| 36 |
- # installation, we have to extract src/ and include/ completely on mac |
| 37 |
- # tools is needed for qt-demo and some others |
| 38 |
- QT4_EXTRACT_DIRECTORIES+=" src include" |
| 39 |
- |
| 40 |
- if [[ ${PN} == qt-demo || ${PN} == qt-qt3support || ${PN} == qt-webkit ]]; then |
| 41 |
- QT4_EXTRACT_DIRECTORIES+=" tools" |
| 42 |
- fi |
| 43 |
+ # On MacOS we *need* at least src/gui/kernel/qapplication_mac.mm for |
| 44 |
+ # platform detection. Note: needs to come before any directories to |
| 45 |
+ # avoid extract failure. |
| 46 |
+ [[ ${CHOST} == *-apple-darwin* ]] && \ |
| 47 |
+ QT4_EXTRACT_DIRECTORIES="src/gui/kernel/qapplication_mac.mm ${QT4_EXTRACT_DIRECTORIES}" |
| 48 |
fi |
| 49 |
|
| 50 |
# Make sure ebuilds use the required EAPI |
Archives