* [gentoo-commits] gentoo-x86 commit in eclass: qt4-build.eclass qt4-r2.eclass
@ 2010-08-14 18:00 Markos Chandras (hwoarang)
0 siblings, 0 replies; 2+ messages in thread
From: Markos Chandras (hwoarang) @ 2010-08-14 18:00 UTC (permalink / raw
To: gentoo-commits
hwoarang 10/08/14 18:00:38
Modified: qt4-build.eclass qt4-r2.eclass
Log:
Quote CC,CXX,LD,LINK. Bug #332669. Thanks to Harald van Dijk
Revision Changes Path
1.81 eclass/qt4-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.81&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.81&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?r1=1.80&r2=1.81
Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- qt4-build.eclass 13 Aug 2010 16:36:10 -0000 1.80
+++ qt4-build.eclass 14 Aug 2010 18:00:38 -0000 1.81
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.80 2010/08/13 16:36:10 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.81 2010/08/14 18:00:38 hwoarang Exp $
# @ECLASS: qt4-build.eclass
# @MAINTAINER:
@@ -224,13 +224,13 @@
fi
# Bug 282984 && Bug 295530
- sed -e "s:\(^SYSTEM_VARIABLES\):CC=$(tc-getCC)\nCXX=$(tc-getCXX)\nCFLAGS=\"${CFLAGS}\"\nCXXFLAGS=\"${CXXFLAGS}\"\nLDFLAGS=\"${LDFLAGS}\"\n\1:" \
+ sed -e "s:\(^SYSTEM_VARIABLES\):CC="$(tc-getCC)"\nCXX="$(tc-getCXX)"\nCFLAGS=\"${CFLAGS}\"\nCXXFLAGS=\"${CXXFLAGS}\"\nLDFLAGS=\"${LDFLAGS}\"\n\1:" \
-i configure || die "sed qmake compilers failed"
# bug 321335
if version_is_at_least 4.6; then
find ./config.tests/unix -name "*.test" -type f -exec grep -lZ \$MAKE '{}' \; | \
xargs -0 \
- sed -e "s:\(\$MAKE\):\1 CC=$(tc-getCC) CXX=$(tc-getCXX) LD=$(tc-getCXX) LINK=$(tc-getCXX):g" \
+ sed -e "s:\(\$MAKE\):\1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getCXX)" "LINK=$(tc-getCXX)":g" \
-i || die "sed test compilers failed"
fi
1.8 eclass/qt4-r2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-r2.eclass?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-r2.eclass?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-r2.eclass?r1=1.7&r2=1.8
Index: qt4-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qt4-r2.eclass 31 Jul 2010 14:40:14 -0000 1.7
+++ qt4-r2.eclass 14 Aug 2010 18:00:38 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v 1.7 2010/07/31 14:40:14 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v 1.8 2010/08/14 18:00:38 hwoarang Exp $
# @ECLASS: qt4-r2.eclass
# @MAINTAINER:
@@ -249,9 +249,9 @@
-config ${CONFIG_ADD} \
QTDIR="${EPREFIX}"/usr/$(get_libdir) \
QMAKE="${EPREFIX}"/usr/bin/qmake \
- QMAKE_CC=$(tc-getCC) \
- QMAKE_CXX=$(tc-getCXX) \
- QMAKE_LINK=$(tc-getCXX) \
+ QMAKE_CC="$(tc-getCC)" \
+ QMAKE_CXX="$(tc-getCXX)" \
+ QMAKE_LINK="$(tc-getCXX)" \
QMAKE_CFLAGS_RELEASE="${CFLAGS}" \
QMAKE_CFLAGS_DEBUG="${CFLAGS}" \
QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4-build.eclass qt4-r2.eclass
@ 2012-10-04 3:52 Davide Pesavento (pesa)
0 siblings, 0 replies; 2+ messages in thread
From: Davide Pesavento (pesa) @ 2012-10-04 3:52 UTC (permalink / raw
To: gentoo-commits
pesa 12/10/04 03:52:35
Modified: qt4-build.eclass qt4-r2.eclass
Log:
Rephrase "unsupported EAPI" die message.
Revision Changes Path
1.137 eclass/qt4-build.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.137&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.137&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?r1=1.136&r2=1.137
Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- qt4-build.eclass 27 Sep 2012 16:35:41 -0000 1.136
+++ qt4-build.eclass 4 Oct 2012 03:52:35 -0000 1.137
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.136 2012/09/27 16:35:41 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.137 2012/10/04 03:52:35 pesa Exp $
# @ECLASS: qt4-build.eclass
# @MAINTAINER:
@@ -10,8 +10,8 @@
# This eclass contains various functions that are used when building Qt4.
case ${EAPI} in
- 2|3|4|5) : ;;
- *) die "qt4-build.eclass requires EAPI 2, 3 or 4." ;;
+ 2|3|4|5) : ;;
+ *) die "qt4-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
esac
inherit eutils flag-o-matic multilib toolchain-funcs versionator
1.23 eclass/qt4-r2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-r2.eclass?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-r2.eclass?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-r2.eclass?r1=1.22&r2=1.23
Index: qt4-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- qt4-r2.eclass 27 Sep 2012 16:35:41 -0000 1.22
+++ qt4-r2.eclass 4 Oct 2012 03:52:35 -0000 1.23
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v 1.22 2012/09/27 16:35:41 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v 1.23 2012/10/04 03:52:35 pesa Exp $
# @ECLASS: qt4-r2.eclass
# @MAINTAINER:
@@ -11,8 +11,8 @@
# dealing with packages using Qt4 libraries. Requires EAPI=2 or later.
case ${EAPI} in
- 2|3|4|5) : ;;
- *) die "EAPI=${EAPI} is not supported by ${ECLASS} eclass." ;;
+ 2|3|4|5) : ;;
+ *) die "qt4-r2.eclass: unsupported EAPI=${EAPI:-0}" ;;
esac
inherit base eutils multilib toolchain-funcs
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-10-04 3:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-04 3:52 [gentoo-commits] gentoo-x86 commit in eclass: qt4-build.eclass qt4-r2.eclass Davide Pesavento (pesa)
-- strict thread matches above, loose matches on Subject: below --
2010-08-14 18:00 Markos Chandras (hwoarang)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox