| 1 |
caleb 07/12/22 17:32:55 |
| 2 |
|
| 3 |
Modified: qt4-build.eclass |
| 4 |
Log: |
| 5 |
spaces to tabs |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.5 eclass/qt4-build.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.5&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.5&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.4&r2=1.5 |
| 13 |
|
| 14 |
Index: qt4-build.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v |
| 17 |
retrieving revision 1.4 |
| 18 |
retrieving revision 1.5 |
| 19 |
diff -u -r1.4 -r1.5 |
| 20 |
--- qt4-build.eclass 22 Dec 2007 16:28:59 -0000 1.4 |
| 21 |
+++ qt4-build.eclass 22 Dec 2007 17:32:55 -0000 1.5 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 2005 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.4 2007/12/22 16:28:59 caleb Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.5 2007/12/22 17:32:55 caleb Exp $ |
| 27 |
|
| 28 |
# @ECLASS: qt4-build.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -17,21 +17,21 @@ |
| 31 |
qt4-build_pkg_setup() { |
| 32 |
# Set up installation directories |
| 33 |
|
| 34 |
- QTBASEDIR=/usr/$(get_libdir)/qt4 |
| 35 |
- QTPREFIXDIR=/usr |
| 36 |
- QTBINDIR=/usr/bin |
| 37 |
- QTLIBDIR=/usr/$(get_libdir)/qt4 |
| 38 |
- QTPCDIR=/usr/$(get_libdir)/pkgconfig |
| 39 |
- QTDATADIR=/usr/share/qt4 |
| 40 |
- QTDOCDIR=/usr/share/doc/${PF} |
| 41 |
- QTHEADERDIR=/usr/include/qt4 |
| 42 |
- QTPLUGINDIR=${QTLIBDIR}/plugins |
| 43 |
- QTSYSCONFDIR=/etc/qt4 |
| 44 |
- QTTRANSDIR=${QTDATADIR}/translations |
| 45 |
- QTEXAMPLESDIR=${QTDATADIR}/examples |
| 46 |
- QTDEMOSDIR=${QTDATADIR}/demos |
| 47 |
+ QTBASEDIR=/usr/$(get_libdir)/qt4 |
| 48 |
+ QTPREFIXDIR=/usr |
| 49 |
+ QTBINDIR=/usr/bin |
| 50 |
+ QTLIBDIR=/usr/$(get_libdir)/qt4 |
| 51 |
+ QTPCDIR=/usr/$(get_libdir)/pkgconfig |
| 52 |
+ QTDATADIR=/usr/share/qt4 |
| 53 |
+ QTDOCDIR=/usr/share/doc/${PF} |
| 54 |
+ QTHEADERDIR=/usr/include/qt4 |
| 55 |
+ QTPLUGINDIR=${QTLIBDIR}/plugins |
| 56 |
+ QTSYSCONFDIR=/etc/qt4 |
| 57 |
+ QTTRANSDIR=${QTDATADIR}/translations |
| 58 |
+ QTEXAMPLESDIR=${QTDATADIR}/examples |
| 59 |
+ QTDEMOSDIR=${QTDATADIR}/demos |
| 60 |
|
| 61 |
- PLATFORM=$(qt_mkspecs_dir) |
| 62 |
+ PLATFORM=$(qt_mkspecs_dir) |
| 63 |
|
| 64 |
PATH="${S}/bin:${PATH}" |
| 65 |
LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" |
| 66 |
@@ -143,46 +143,46 @@ |
| 67 |
} |
| 68 |
|
| 69 |
qt_use() { |
| 70 |
- local flag="$1" |
| 71 |
- local feature="$1" |
| 72 |
- local enableval= |
| 73 |
+ local flag="$1" |
| 74 |
+ local feature="$1" |
| 75 |
+ local enableval= |
| 76 |
|
| 77 |
- [[ -n $2 ]] && feature=$2 |
| 78 |
- [[ -n $3 ]] && enableval="-$3" |
| 79 |
+ [[ -n $2 ]] && feature=$2 |
| 80 |
+ [[ -n $3 ]] && enableval="-$3" |
| 81 |
|
| 82 |
- useq $flag && echo "${enableval}-${feature}" || echo "-no-${feature}" |
| 83 |
- return 0 |
| 84 |
+ useq $flag && echo "${enableval}-${feature}" || echo "-no-${feature}" |
| 85 |
+ return 0 |
| 86 |
} |
| 87 |
|
| 88 |
qt_mkspecs_dir() { |
| 89 |
- # Allows us to define which mkspecs dir we want to use. |
| 90 |
- local spec |
| 91 |
+ # Allows us to define which mkspecs dir we want to use. |
| 92 |
+ local spec |
| 93 |
|
| 94 |
- case ${CHOST} in |
| 95 |
- *-freebsd*|*-dragonfly*) |
| 96 |
- spec="freebsd" ;; |
| 97 |
- *-openbsd*) |
| 98 |
- spec="openbsd" ;; |
| 99 |
- *-netbsd*) |
| 100 |
- spec="netbsd" ;; |
| 101 |
- *-darwin*) |
| 102 |
- spec="darwin" ;; |
| 103 |
- *-linux-*|*-linux) |
| 104 |
- spec="linux" ;; |
| 105 |
- *) |
| 106 |
- die "Unknown CHOST, no platform choosed." |
| 107 |
- esac |
| 108 |
- |
| 109 |
- CXX=$(tc-getCXX) |
| 110 |
- if [[ ${CXX/g++/} != ${CXX} ]]; then |
| 111 |
- spec="${spec}-g++" |
| 112 |
- elif [[ ${CXX/icpc/} != ${CXX} ]]; then |
| 113 |
- spec="${spec}-icc" |
| 114 |
- else |
| 115 |
- die "Unknown compiler ${CXX}." |
| 116 |
- fi |
| 117 |
+ case ${CHOST} in |
| 118 |
+ *-freebsd*|*-dragonfly*) |
| 119 |
+ spec="freebsd" ;; |
| 120 |
+ *-openbsd*) |
| 121 |
+ spec="openbsd" ;; |
| 122 |
+ *-netbsd*) |
| 123 |
+ spec="netbsd" ;; |
| 124 |
+ *-darwin*) |
| 125 |
+ spec="darwin" ;; |
| 126 |
+ *-linux-*|*-linux) |
| 127 |
+ spec="linux" ;; |
| 128 |
+ *) |
| 129 |
+ die "Unknown CHOST, no platform choosed." |
| 130 |
+ esac |
| 131 |
+ |
| 132 |
+ CXX=$(tc-getCXX) |
| 133 |
+ if [[ ${CXX/g++/} != ${CXX} ]]; then |
| 134 |
+ spec="${spec}-g++" |
| 135 |
+ elif [[ ${CXX/icpc/} != ${CXX} ]]; then |
| 136 |
+ spec="${spec}-icc" |
| 137 |
+ else |
| 138 |
+ die "Unknown compiler ${CXX}." |
| 139 |
+ fi |
| 140 |
|
| 141 |
- echo "${spec}" |
| 142 |
+ echo "${spec}" |
| 143 |
} |
| 144 |
|
| 145 |
EXPORT_FUNCTIONS pkg_setup src_unpack src_install |
| 146 |
|
| 147 |
|
| 148 |
|
| 149 |
-- |
| 150 |
gentoo-commits@g.o mailing list |
Archives