/[gentoo-x86]/eclass/qt4-build.eclass
Gentoo

Diff of /eclass/qt4-build.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.36 Revision 1.46
1# Copyright 2007-2009 Gentoo Foundation 1# Copyright 2007-2009 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.36 2009/05/29 14:48:00 hwoarang Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.46 2009/10/02 16:39:41 wired Exp $
4 4
5# @ECLASS: qt4-build.eclass 5# @ECLASS: qt4-build.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Ben de Groot <yngwin@gentoo.org>, 7# Ben de Groot <yngwin@gentoo.org>,
8# Markos Chandras <hwoarang@gentoo.org>, 8# Markos Chandras <hwoarang@gentoo.org>,
9# Caleb Tennis <caleb@gentoo.org> 9# Caleb Tennis <caleb@gentoo.org>
10# Alex Alexander <wired@gentoo.org>
10# @BLURB: Eclass for Qt4 split ebuilds. 11# @BLURB: Eclass for Qt4 split ebuilds.
11# @DESCRIPTION: 12# @DESCRIPTION:
12# This eclass contains various functions that are used when building Qt4 13# This eclass contains various functions that are used when building Qt4
13 14
14inherit eutils multilib toolchain-funcs flag-o-matic versionator 15inherit base eutils multilib toolchain-funcs flag-o-matic versionator
15 16
16IUSE="${IUSE} custom-cxxflags debug pch" 17IUSE="${IUSE} debug pch"
17RDEPEND=" 18RDEPEND="
18 !<x11-libs/qt-assistant-${PV} 19 !<x11-libs/qt-assistant-${PV}
19 !>x11-libs/qt-assistant-${PV}-r9999 20 !>x11-libs/qt-assistant-${PV}-r9999
20 !<x11-libs/qt-core-${PV} 21 !<x11-libs/qt-core-${PV}
21 !>x11-libs/qt-core-${PV}-r9999 22 !>x11-libs/qt-core-${PV}-r9999
55 ;; 56 ;;
56esac 57esac
57MY_P=qt-x11-${SRCTYPE}-${MY_PV} 58MY_P=qt-x11-${SRCTYPE}-${MY_PV}
58S=${WORKDIR}/${MY_P} 59S=${WORKDIR}/${MY_P}
59 60
60HOMEPAGE="http://www.qtsoftware.com/" 61HOMEPAGE="http://qt.nokia.com/"
61SRC_URI="http://download.qtsoftware.com/qt/source/${MY_P}.tar.bz2" 62SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.bz2"
63if version_is_at_least 4.5.3 ${PV} ; then
64 SRC_URI="${SRC_URI/bz2/gz}"
65fi
62 66
63case "${PV}" in 67case "${PV}" in
64 4.4.?) SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-headers.tar.bz2" ;; 68 4.4.?) SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-headers.tar.bz2" ;;
65 *) ;; 69 *) ;;
66esac 70esac
82 fi 86 fi
83 87
84 # Check USE requirements 88 # Check USE requirements
85 qt4-build_check_use 89 qt4-build_check_use
86 fi 90 fi
91
92 PATH="${S}/bin:${PATH}"
93 LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
94
95 if ! version_is_at_least 4.1 $(gcc-version) ; then
96 ewarn "Using a GCC version lower than 4.1 is not supported!"
97 echo
98 ebeep 3
99 fi
100}
101
102# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
103# @DESCRIPTION:
104# Arguments for build_target_directories. Takes the directories, in which the
105# code should be compiled. This is a space-separated list
106
107# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
108# @DESCRIPTION:
109# Space separated list including the directories that will be extracted from Qt
110# tarball
111
112# @FUNCTION: qt4-build_src_unpack
113# @DESCRIPTION:
114# Unpacks the sources
115qt4-build_src_unpack() {
116 setqtenv
117 local target targets licenses tar_pkg tar_args
118 if version_is_at_least 4.5 ${PV} ; then
119 licenses="LICENSE.GPL3 LICENSE.LGPL"
120 else
121 licenses="LICENSE.GPL2 LICENSE.GPL3"
122 fi
123 for target in configure ${licenses} projects.pro \
124 src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \
125 ${QT4_EXTRACT_DIRECTORIES}; do
126 targets="${targets} ${MY_P}/${target}"
127 done
128
129 tar_pkg=${MY_P}.tar.bz2
130 tar_args="xjpf"
131 if version_is_at_least 4.5.3 ${PV} ; then
132 tar_pkg=${tar_pkg/bz2/gz}
133 tar_args="xzpf"
134 fi
135
136 echo tar ${tar_args} "${DISTDIR}"/${tar_pkg} ${targets}
137 tar ${tar_args} "${DISTDIR}"/${tar_pkg} ${targets}
138
139 case "${PV}" in
140 4.4.?)
141 echo tar xjpf "${DISTDIR}"/${MY_P}-headers.tar.bz2
142 tar xjpf "${DISTDIR}"/${MY_P}-headers.tar.bz2
143 ;;
144 esac
145
146 # Be backwards compatible for now
147 if [[ $EAPI != 2 ]]; then
148 qt4-build_src_prepare
149 fi
150}
151
152# @ECLASS-VARIABLE: PATCHES
153# @DESCRIPTION:
154# In case you have patches to apply, specify them in PATCHES variable. Make sure
155# to specify the full path. This variable is necessary for src_prepare phase.
156# example:
157# PATCHES="${FILESDIR}"/mypatch.patch
158# ${FILESDIR}"/mypatch2.patch"
159#
160
161# @FUNCTION: qt4-build_src_prepare
162# @DESCRIPTION:
163# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
164# source files in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified on /etc/make.conf.
165qt4-build_src_prepare() {
166 setqtenv
167 cd "${S}"
168
169 if [[ ${PN} != qt-core ]]; then
170 skip_qmake_build_patch
171 skip_project_generation_patch
172 symlink_binaries_to_buildtree
173 fi
174
175 # Bug 178652
176 if [[ "$(gcc-major-version)" == "3" ]] && use amd64; then
177 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
178 append-flags -fno-gcse
179 fi
180
181 # Unsupported old gcc versions - hardened needs this :(
182 if [[ $(gcc-major-version) -lt "4" ]] ; then
183 ewarn "Appending -fno-stack-protector to CXXFLAGS"
184 append-cxxflags -fno-stack-protector
185 # Bug 253127
186 sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \
187 -i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed"
188 fi
189
190 # Bug 172219
191 sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
192 -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
193 -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
194 -e "s:X11R6/::" \
195 -i "${S}"/mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed ${S}/mkspecs/$(qt_mkspecs_dir)/qmake.conf failed"
196
197 sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
198 -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
199 -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
200 -i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed"
201
202 base_src_prepare
203}
204
205# @FUNCTION: qt4-build_src_configure
206# @DESCRIPTION:
207# Default configure phase
208qt4-build_src_configure() {
209 setqtenv
210 myconf="$(standard_configure_options) ${myconf}"
211
212 echo ./configure ${myconf}
213 ./configure ${myconf} || die "./configure failed"
214 myconf=""
215}
216
217# @FUNCTION: qt4-build_src_compile
218# @DESCRIPTION: Actual compile phase
219qt4-build_src_compile() {
220 setqtenv
221 # Be backwards compatible for now
222 if [[ $EAPI != 2 ]]; then
223 qt4-build_src_configure
224 fi
225
226 build_directories "${QT4_TARGET_DIRECTORIES}"
227}
228
229# @FUNCTION: qt4-build_src_install
230# @DESCRIPTION:
231# Perform the actual installation including some library fixes.
232qt4-build_src_install() {
233 setqtenv
234 install_directories "${QT4_TARGET_DIRECTORIES}"
235 install_qconfigs
236 fix_library_files
237}
238
239# @FUNCTION: setqtenv
240setqtenv() {
87 # Set up installation directories 241 # Set up installation directories
88 QTBASEDIR=/usr/$(get_libdir)/qt4 242 QTBASEDIR=/usr/$(get_libdir)/qt4
89 QTPREFIXDIR=/usr 243 QTPREFIXDIR=/usr
90 QTBINDIR=/usr/bin 244 QTBINDIR=/usr/bin
91 QTLIBDIR=/usr/$(get_libdir)/qt4 245 QTLIBDIR=/usr/$(get_libdir)/qt4
246 QMAKE_LIBDIR_QT=${QTLIBDIR}
92 QTPCDIR=/usr/$(get_libdir)/pkgconfig 247 QTPCDIR=/usr/$(get_libdir)/pkgconfig
93 QTDATADIR=/usr/share/qt4 248 QTDATADIR=/usr/share/qt4
94 QTDOCDIR=/usr/share/doc/qt-${PV} 249 QTDOCDIR=/usr/share/doc/qt-${PV}
95 QTHEADERDIR=/usr/include/qt4 250 QTHEADERDIR=/usr/include/qt4
96 QTPLUGINDIR=${QTLIBDIR}/plugins 251 QTPLUGINDIR=${QTLIBDIR}/plugins
97 QTSYSCONFDIR=/etc/qt4 252 QTSYSCONFDIR=/etc/qt4
98 QTTRANSDIR=${QTDATADIR}/translations 253 QTTRANSDIR=${QTDATADIR}/translations
99 QTEXAMPLESDIR=${QTDATADIR}/examples 254 QTEXAMPLESDIR=${QTDATADIR}/examples
100 QTDEMOSDIR=${QTDATADIR}/demos 255 QTDEMOSDIR=${QTDATADIR}/demos
101 256 QT_INSTALL_PREFIX=/usr/$(get_libdir)/qt4
102 PLATFORM=$(qt_mkspecs_dir) 257 PLATFORM=$(qt_mkspecs_dir)
103 258
104 PATH="${S}/bin:${PATH}" 259 unset QMAKESPEC
105 LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
106
107 if ! version_is_at_least 4.1 $(gcc-version) ; then
108 ewarn "Using a GCC version lower than 4.1 is not supported!"
109 echo
110 ebeep 3
111 fi
112
113 if use custom-cxxflags; then
114 echo
115 ewarn "You have set USE=custom-cxxflags, which means Qt will be built with the"
116 ewarn "CXXFLAGS you have set in /etc/make.conf. This is not supported, and we"
117 ewarn "recommend to unset this useflag. But you are free to experiment with it."
118 ewarn "Just do not start crying if it breaks your system, or eats your kitten"
119 ewarn "for breakfast. ;-) "
120 echo
121 fi
122
123}
124
125# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
126# @DESCRIPTION:
127# Arguments for build_target_directories. Takes the directories, in which the
128# code should be compiled. This is a space-separated list
129
130# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
131# @DESCRIPTION:
132# Space separated list including the directories that will be extracted from Qt
133# tarball
134
135# @FUNCTION: qt4-build_src_unpack
136# @DESCRIPTION:
137# Unpacks the sources
138qt4-build_src_unpack() {
139 local target targets licenses
140 if version_is_at_least 4.5 ${PV} ; then
141 licenses="LICENSE.GPL3 LICENSE.LGPL"
142 else
143 licenses="LICENSE.GPL2 LICENSE.GPL3"
144 fi
145 for target in configure ${licenses} projects.pro \
146 src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \
147 ${QT4_EXTRACT_DIRECTORIES}; do
148 targets="${targets} ${MY_P}/${target}"
149 done
150
151 echo tar xjpf "${DISTDIR}"/${MY_P}.tar.bz2 ${targets}
152 tar xjpf "${DISTDIR}"/${MY_P}.tar.bz2 ${targets}
153
154 case "${PV}" in
155 4.4.?)
156 echo tar xjpf "${DISTDIR}"/${MY_P}-headers.tar.bz2
157 tar xjpf "${DISTDIR}"/${MY_P}-headers.tar.bz2
158 ;;
159 esac
160
161 # Be backwards compatible for now
162 if [[ $EAPI != 2 ]]; then
163 qt4-build_src_prepare
164 fi
165}
166
167
168# @FUNCTION: qt4-build_src_prepare
169# @DESCRIPTION:
170# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
171# source files in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified on /etc/make.conf.
172qt4-build_src_prepare() {
173 cd "${S}"
174
175 if [[ ${PN} != qt-core ]]; then
176 skip_qmake_build_patch
177 skip_project_generation_patch
178 symlink_binaries_to_buildtree
179 fi
180
181 if ! use custom-cxxflags;then
182 # Don't let the user go too overboard with flags.
183 strip-flags
184 replace-flags -O3 -O2
185 fi
186
187 # Bug 178652
188 if [[ "$(gcc-major-version)" == "3" ]] && use amd64; then
189 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
190 append-flags -fno-gcse
191 fi
192
193 # Unsupported old gcc versions - hardened needs this :(
194 if [[ $(gcc-major-version) -lt "4" ]] ; then
195 ewarn "Appending -fno-stack-protector to CXXFLAGS"
196 append-cxxflags -fno-stack-protector
197 # Bug 253127
198 sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \
199 -i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed"
200 fi
201
202 # Bug 172219
203 sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
204 -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
205 -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
206 -e "s:X11R6/::" \
207 -i "${S}"/mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed ${S}/mkspecs/$(qt_mkspecs_dir)/qmake.conf failed"
208
209 sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
210 -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
211 -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
212 -i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed"
213
214}
215
216# @FUNCTION: qt4-build_src_configure
217# @DESCRIPTION:
218# Default configure phase
219qt4-build_src_configure() {
220
221 myconf="$(standard_configure_options) ${myconf}"
222
223 echo ./configure ${myconf}
224 ./configure ${myconf} || die "./configure failed"
225}
226
227# @FUNCTION: qt4-build_src_compile
228# @DESCRIPTION: Actual compile phase
229qt4-build_src_compile() {
230 # Be backwards compatible for now
231 if [[ $EAPI != 2 ]]; then
232 qt4-build_src_configure
233 fi
234
235 build_directories "${QT4_TARGET_DIRECTORIES}"
236}
237
238# @FUNCTION: qt4-build_src_install
239# @DESCRIPTION:
240# Perform the actual installation including some library fixes.
241qt4-build_src_install() {
242 install_directories "${QT4_TARGET_DIRECTORIES}"
243 install_qconfigs
244 fix_library_files
245} 260}
246 261
247# @FUNCTION: standard_configure_options 262# @FUNCTION: standard_configure_options
248# @DESCRIPTION: 263# @DESCRIPTION:
249# Sets up some standard configure options, like libdir (if necessary), whether 264# Sets up some standard configure options, like libdir (if necessary), whether
280 alpha|arm|ia64|mips|s390|sparc) myconf="${myconf} -arch $(tc-arch)" ;; 295 alpha|arm|ia64|mips|s390|sparc) myconf="${myconf} -arch $(tc-arch)" ;;
281 hppa|sh) myconf="${myconf} -arch generic" ;; 296 hppa|sh) myconf="${myconf} -arch generic" ;;
282 *) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;; 297 *) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
283 esac 298 esac
284 299
285 # Bug 261412 Qt configure detects archs by uname
286 case "$(tc-arch)" in
287 ppc) myconf="${myconf} -platform linux-g++-32";;
288 esac
289
290 myconf="${myconf} -stl -verbose -largefile -confirm-license -no-rpath 300 myconf="${myconf} -platform $(qt_mkspecs_dir) -stl -verbose -largefile -confirm-license -no-rpath
291 -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} 301 -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
292 -datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} 302 -datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR}
293 -plugindir ${QTPLUGINDIR} -sysconfdir ${QTSYSCONFDIR} 303 -plugindir ${QTPLUGINDIR} -sysconfdir ${QTSYSCONFDIR}
294 -translationdir ${QTTRANSDIR} -examplesdir ${QTEXAMPLESDIR} 304 -translationdir ${QTTRANSDIR} -examplesdir ${QTEXAMPLESDIR}
295 -demosdir ${QTDEMOSDIR} -silent -fast 305 -demosdir ${QTDEMOSDIR} -silent -fast
296 $([[ ${PN} == qt-xmlpatterns ]] || echo -no-exceptions) 306 $([[ ${PN} == qt-xmlpatterns ]] || echo -no-exceptions)
297 -reduce-relocations -nomake examples -nomake demos" 307 -reduce-relocations -nomake examples -nomake demos"
298 308
299 # Make eclass 4.5.{1,2} ready 309 # Make eclass 4.5.x ready
300 case "${MY_PV}" in 310 case "${MY_PV}" in
301 4.5.1 | 4.5.2) 311 4.5.?)
302 myconf="${myconf} -opensource" 312 myconf="${myconf} -opensource"
303 ;; 313 ;;
304 esac 314 esac
305 315
306 echo "${myconf}" 316 echo "${myconf}"
312# Compiles the code in $QT4_TARGET_DIRECTORIES 322# Compiles the code in $QT4_TARGET_DIRECTORIES
313build_directories() { 323build_directories() {
314 local dirs="$@" 324 local dirs="$@"
315 for x in ${dirs}; do 325 for x in ${dirs}; do
316 cd "${S}"/${x} 326 cd "${S}"/${x}
327 sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:/usr/$(get_libdir)/qt4:g" $(find "${S}" -name '*.pr[io]') "${S}"/mkspecs/common/linux.conf || die
317 "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed" 328 "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
318 emake || die "emake failed" 329 emake || die "emake failed"
319 done 330 done
320} 331}
321 332
447 ewarn "Packages that typically need to be recompiled are kdelibs from KDE4, any" 458 ewarn "Packages that typically need to be recompiled are kdelibs from KDE4, any"
448 ewarn "additional KDE4/Qt4 styles, qscintilla and PyQt4. Before filing a bug report," 459 ewarn "additional KDE4/Qt4 styles, qscintilla and PyQt4. Before filing a bug report,"
449 ewarn "make sure all your Qt4 packages are up-to-date and built with the same" 460 ewarn "make sure all your Qt4 packages are up-to-date and built with the same"
450 ewarn "configuration." 461 ewarn "configuration."
451 ewarn 462 ewarn
452 ewarn "For more information, see http://doc.trolltech.com/4.4/plugins-howto.html" 463 ewarn "For more information, see http://doc.trolltech.com/${PV%.*}/plugins-howto.html"
453 echo 464 echo
454} 465}
455 466
456# @FUNCTION: skip_qmake_build_patch 467# @FUNCTION: skip_qmake_build_patch
457# @DESCRIPTION: 468# @DESCRIPTION:
507 rmdir "${D}"/${QTLIBDIR}/pkgconfig 518 rmdir "${D}"/${QTLIBDIR}/pkgconfig
508} 519}
509 520
510# @FUNCTION: qt_use 521# @FUNCTION: qt_use
511# @USAGE: < flag > [ feature ] [ enableval ] 522# @USAGE: < flag > [ feature ] [ enableval ]
512# @DESCRIPTION: 523# @DESCRIPTION:
513# This will echo "${enableval}-${feature}" if <flag> is enabled, or 524# This will echo "${enableval}-${feature}" if <flag> is enabled, or
514# "-no-${feature} if the flag is disabled. If [feature] is not specified <flag> 525# "-no-${feature} if the flag is disabled. If [feature] is not specified <flag>
515# will be used for that. If [enableval] is not specified, it omits the 526# will be used for that. If [enableval] is not specified, it omits the
516# assignment-part 527# assignment-part
517qt_use() { 528qt_use() {
599 fi 610 fi
600} 611}
601 612
602# @FUNCTION: qt_mkspecs_dir 613# @FUNCTION: qt_mkspecs_dir
603# @RETURN: the specs-directory w/o path 614# @RETURN: the specs-directory w/o path
604# @DESCRIPTION: 615# @DESCRIPTION:
605# Allows us to define which mkspecs dir we want to use. 616# Allows us to define which mkspecs dir we want to use.
606qt_mkspecs_dir() { 617qt_mkspecs_dir() {
607 # Allows us to define which mkspecs dir we want to use. 618 # Allows us to define which mkspecs dir we want to use.
608 local spec 619 local spec
609 620
628 elif [[ ${CXX/icpc/} != ${CXX} ]]; then 639 elif [[ ${CXX/icpc/} != ${CXX} ]]; then
629 spec="${spec}-icc" 640 spec="${spec}-icc"
630 else 641 else
631 die "Unknown compiler ${CXX}." 642 die "Unknown compiler ${CXX}."
632 fi 643 fi
644 if [[ -n "${LIBDIR/lib}" ]]; then
645 spec="${spec}-${LIBDIR/lib}"
646 fi
633 647
634 echo "${spec}" 648 echo "${spec}"
635} 649}
636 650
637case ${EAPI:-0} in 651case ${EAPI:-0} in

Legend:
Removed from v.1.36  
changed lines
  Added in v.1.46

  ViewVC Help
Powered by ViewVC 1.1.20