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

Diff of /eclass/qt4-build.eclass

Parent Directory | Revision Log | View Patch Patch

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

 Legend:



Removed from v.1.36
 


changed lines


 
Added in v.1.45
 Legend:



Removed from v.1.36
 


changed lines


 
Added in v.1.45
-Removed from v.1.36
+Added in v.1.45

	ViewVC Help
Powered by ViewVC 1.1.20