| 1 |
pesa 12/03/01 15:19:14 |
| 2 |
|
| 3 |
Modified: ChangeLog qt4-build.eclass |
| 4 |
Log: |
| 5 |
Cleanup qt_mkspecs_dir(). |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.150 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.150&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.150&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.149&r2=1.150 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.149 |
| 18 |
retrieving revision 1.150 |
| 19 |
diff -u -r1.149 -r1.150 |
| 20 |
--- ChangeLog 1 Mar 2012 15:06:00 -0000 1.149 |
| 21 |
+++ ChangeLog 1 Mar 2012 15:19:14 -0000 1.150 |
| 22 |
@@ -1,6 +1,9 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.149 2012/03/01 15:06:00 pesa Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.150 2012/03/01 15:19:14 pesa Exp $ |
| 27 |
+ |
| 28 |
+ 01 Mar 2012; Davide Pesavento <pesa@g.o> qt4-build.eclass: |
| 29 |
+ Cleanup qt_mkspecs_dir(). |
| 30 |
|
| 31 |
01 Mar 2012; Davide Pesavento <pesa@g.o> qt4-build.eclass: |
| 32 |
Fold standard_configure_options() into qt4-build_src_configure(). |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.122 eclass/qt4-build.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.122&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.122&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?r1=1.121&r2=1.122 |
| 41 |
|
| 42 |
Index: qt4-build.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v |
| 45 |
retrieving revision 1.121 |
| 46 |
retrieving revision 1.122 |
| 47 |
diff -u -r1.121 -r1.122 |
| 48 |
--- qt4-build.eclass 1 Mar 2012 15:06:00 -0000 1.121 |
| 49 |
+++ qt4-build.eclass 1 Mar 2012 15:19:14 -0000 1.122 |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
# Copyright 1999-2012 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.121 2012/03/01 15:06:00 pesa Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.122 2012/03/01 15:19:14 pesa Exp $ |
| 55 |
|
| 56 |
# @ECLASS: qt4-build.eclass |
| 57 |
# @MAINTAINER: |
| 58 |
@@ -753,7 +753,8 @@ |
| 59 |
# Allows us to define which mkspecs dir we want to use. |
| 60 |
qt_mkspecs_dir() { |
| 61 |
local spec= |
| 62 |
- case ${CHOST} in |
| 63 |
+ |
| 64 |
+ case "${CHOST}" in |
| 65 |
*-freebsd*|*-dragonfly*) |
| 66 |
spec=freebsd ;; |
| 67 |
*-openbsd*) |
| 68 |
@@ -774,17 +775,17 @@ |
| 69 |
*-linux-*|*-linux) |
| 70 |
spec=linux ;; |
| 71 |
*) |
| 72 |
- die "Unknown CHOST, no platform chosen" |
| 73 |
+ die "${FUNCNAME}(): Unknown CHOST '${CHOST}'" ;; |
| 74 |
esac |
| 75 |
|
| 76 |
- CXX=$(tc-getCXX) |
| 77 |
- if [[ ${CXX} == *g++* ]]; then |
| 78 |
- spec+=-g++ |
| 79 |
- elif [[ ${CXX} == *icpc* ]]; then |
| 80 |
- spec+=-icc |
| 81 |
- else |
| 82 |
- die "Unknown compiler '${CXX}'" |
| 83 |
- fi |
| 84 |
+ case "$(tc-getCXX)" in |
| 85 |
+ *g++*) |
| 86 |
+ spec+=-g++ ;; |
| 87 |
+ *icpc*) |
| 88 |
+ spec+=-icc ;; |
| 89 |
+ *) |
| 90 |
+ die "${FUNCNAME}(): Unknown compiler '$(tc-getCXX)'" ;; |
| 91 |
+ esac |
| 92 |
|
| 93 |
# Add -64 for 64bit profiles |
| 94 |
if use x64-freebsd || |
Archives