* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qmake-utils.eclass
@ 2014-11-17 2:15 Davide Pesavento (pesa)
0 siblings, 0 replies; 10+ messages in thread
From: Davide Pesavento (pesa) @ 2014-11-17 2:15 UTC (permalink / raw
To: gentoo-commits
pesa 14/11/17 02:15:42
Modified: ChangeLog qmake-utils.eclass
Log:
Stop setting QTDIR. It's only relevant when building qt itself, and in any case qmake doesn't use it.
Revision Changes Path
1.1425 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1425&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1425&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1424&r2=1.1425
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1424
retrieving revision 1.1425
diff -u -r1.1424 -r1.1425
--- ChangeLog 17 Nov 2014 00:24:43 -0000 1.1424
+++ ChangeLog 17 Nov 2014 02:15:42 -0000 1.1425
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1424 2014/11/17 00:24:43 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1425 2014/11/17 02:15:42 pesa Exp $
+
+ 17 Nov 2014; Davide Pesavento <pesa@gentoo.org> qmake-utils.eclass:
+ Stop setting QTDIR. It's only relevant when building qt itself, and in any
+ case qmake doesn't use it.
17 Nov 2014; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
Add blocker on emul-linux-x86-qtlibs wrt bug 529370.
1.5 eclass/qmake-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.4&r2=1.5
Index: qmake-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qmake-utils.eclass 1 Nov 2014 23:39:05 -0000 1.4
+++ qmake-utils.eclass 17 Nov 2014 02:15:42 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.4 2014/11/01 23:39:05 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.5 2014/11/17 02:15:42 pesa Exp $
# @ECLASS: qmake-utils.eclass
# @MAINTAINER:
@@ -164,7 +164,6 @@
"${qmake_path}" \
-makefile \
- QTDIR="${EPREFIX}"/usr/$(get_libdir) \
QMAKE_AR="$(tc-getAR) cqs" \
QMAKE_CC="$(tc-getCC)" \
QMAKE_CXX="$(tc-getCXX)" \
^ permalink raw reply [flat|nested] 10+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qmake-utils.eclass
@ 2015-06-29 0:27 Davide Pesavento (pesa)
0 siblings, 0 replies; 10+ messages in thread
From: Davide Pesavento (pesa) @ 2015-06-29 0:27 UTC (permalink / raw
To: gentoo-commits
pesa 15/06/29 00:27:17
Modified: ChangeLog qmake-utils.eclass
Log:
Introduce qt{4,5}_get_plugindir(). Rephrase some eclass doc.
Revision Changes Path
1.1694 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1694&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1694&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1693&r2=1.1694
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1693
retrieving revision 1.1694
diff -u -r1.1693 -r1.1694
--- ChangeLog 28 Jun 2015 13:33:48 -0000 1.1693
+++ ChangeLog 29 Jun 2015 00:27:17 -0000 1.1694
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1693 2015/06/28 13:33:48 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1694 2015/06/29 00:27:17 pesa Exp $
+
+ 29 Jun 2015; Davide Pesavento <pesa@gentoo.org> qmake-utils.eclass:
+ Introduce qt{4,5}_get_plugindir(). Rephrase some eclass doc.
28 Jun 2015; James Le Cuirot <chewi@gentoo.org> java-utils-2.eclass:
The -source flag was added in 1.3 or 1.4 (not sure) and we have special code
1.12 eclass/qmake-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.11&r2=1.12
Index: qmake-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qmake-utils.eclass 22 Jun 2015 14:18:19 -0000 1.11
+++ qmake-utils.eclass 29 Jun 2015 00:27:17 -0000 1.12
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.11 2015/06/22 14:18:19 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.12 2015/06/29 00:27:17 pesa Exp $
# @ECLASS: qmake-utils.eclass
# @MAINTAINER:
@@ -22,6 +22,7 @@
# @FUNCTION: qt4_get_bindir
# @DESCRIPTION:
# Echoes the directory where Qt4 binaries are installed.
+# EPREFIX is already prepended to the returned path.
qt4_get_bindir() {
has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
@@ -36,7 +37,6 @@
# @FUNCTION: qt4_get_headerdir
# @DESCRIPTION:
# Echoes the directory where Qt4 headers are installed.
-# Does not take EPREFIX into account.
qt4_get_headerdir() {
echo /usr/include/qt4
}
@@ -44,7 +44,6 @@
# @FUNCTION: qt4_get_libdir
# @DESCRIPTION:
# Echoes the directory where Qt4 libraries are installed.
-# Does not take EPREFIX into account.
qt4_get_libdir() {
echo /usr/$(get_libdir)/qt4
}
@@ -52,14 +51,21 @@
# @FUNCTION: qt4_get_mkspecsdir
# @DESCRIPTION:
# Echoes the directory where Qt4 mkspecs are installed.
-# Does not take EPREFIX into account.
qt4_get_mkspecsdir() {
echo /usr/share/qt4/mkspecs
}
+# @FUNCTION: qt4_get_plugindir
+# @DESCRIPTION:
+# Echoes the directory where Qt4 plugins are installed.
+qt4_get_plugindir() {
+ echo $(qt4_get_libdir)/plugins
+}
+
# @FUNCTION: qt5_get_bindir
# @DESCRIPTION:
# Echoes the directory where Qt5 binaries are installed.
+# EPREFIX is already prepended to the returned path.
qt5_get_bindir() {
has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
@@ -69,7 +75,6 @@
# @FUNCTION: qt5_get_headerdir
# @DESCRIPTION:
# Echoes the directory where Qt5 headers are installed.
-# Does not take EPREFIX into account.
qt5_get_headerdir() {
echo /usr/include/qt5
}
@@ -77,7 +82,6 @@
# @FUNCTION: qt5_get_libdir
# @DESCRIPTION:
# Echoes the directory where Qt5 libraries are installed.
-# Does not take EPREFIX into account.
qt5_get_libdir() {
echo /usr/$(get_libdir)
}
@@ -85,11 +89,17 @@
# @FUNCTION: qt5_get_mkspecsdir
# @DESCRIPTION:
# Echoes the directory where Qt5 mkspecs are installed.
-# Does not take EPREFIX into account.
qt5_get_mkspecsdir() {
echo $(qt5_get_libdir)/qt5/mkspecs
}
+# @FUNCTION: qt5_get_plugindir
+# @DESCRIPTION:
+# Echoes the directory where Qt5 plugins are installed.
+qt5_get_plugindir() {
+ echo $(qt5_get_libdir)/qt5/plugins
+}
+
# @FUNCTION: qmake-utils_find_pro_file
# @RETURN: zero or one qmake .pro file names
# @INTERNAL
@@ -136,10 +146,10 @@
# @FUNCTION: eqmake4
# @USAGE: [project_file] [parameters to qmake]
# @DESCRIPTION:
-# Wrapper for Qt4's qmake. If project_file isn't specified, eqmake4 will
-# look for it in the current directory (${S}, non-recursively). If more
-# than one project file are found, then ${PN}.pro is processed, provided
-# that it exists. Otherwise eqmake4 fails.
+# Wrapper for Qt4's qmake. If project_file is not specified, eqmake4 looks
+# for one in the current directory (non-recursively). If multiple project
+# files are found, then ${PN}.pro is used, if it exists, otherwise eqmake4
+# will not be able to continue.
#
# All other arguments are appended unmodified to qmake command line.
#
^ permalink raw reply [flat|nested] 10+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qmake-utils.eclass
@ 2015-06-22 14:18 Davide Pesavento (pesa)
0 siblings, 0 replies; 10+ messages in thread
From: Davide Pesavento (pesa) @ 2015-06-22 14:18 UTC (permalink / raw
To: gentoo-commits
pesa 15/06/22 14:18:19
Modified: ChangeLog qmake-utils.eclass
Log:
Introduce qt{4,5}_get_libdir().
Revision Changes Path
1.1678 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1678&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1678&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1677&r2=1.1678
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1677
retrieving revision 1.1678
diff -u -r1.1677 -r1.1678
--- ChangeLog 22 Jun 2015 08:39:36 -0000 1.1677
+++ ChangeLog 22 Jun 2015 14:18:19 -0000 1.1678
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1677 2015/06/22 08:39:36 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1678 2015/06/22 14:18:19 pesa Exp $
+
+ 22 Jun 2015; Davide Pesavento <pesa@gentoo.org> qmake-utils.eclass:
+ Introduce qt{4,5}_get_libdir().
22 Jun 2015; Manuel Rüger <mrueg@gentoo.org> git-r3.eclass:
Fix typo.
1.11 eclass/qmake-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.10&r2=1.11
Index: qmake-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qmake-utils.eclass 16 Jun 2015 17:47:24 -0000 1.10
+++ qmake-utils.eclass 22 Jun 2015 14:18:19 -0000 1.11
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.10 2015/06/16 17:47:24 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.11 2015/06/22 14:18:19 pesa Exp $
# @ECLASS: qmake-utils.eclass
# @MAINTAINER:
@@ -25,7 +25,7 @@
qt4_get_bindir() {
has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
- local qtbindir=${EPREFIX}/usr/$(get_libdir)/qt4/bin
+ local qtbindir=${EPREFIX}$(qt4_get_libdir)/bin
if [[ -d ${qtbindir} ]]; then
echo ${qtbindir}
else
@@ -41,6 +41,14 @@
echo /usr/include/qt4
}
+# @FUNCTION: qt4_get_libdir
+# @DESCRIPTION:
+# Echoes the directory where Qt4 libraries are installed.
+# Does not take EPREFIX into account.
+qt4_get_libdir() {
+ echo /usr/$(get_libdir)/qt4
+}
+
# @FUNCTION: qt4_get_mkspecsdir
# @DESCRIPTION:
# Echoes the directory where Qt4 mkspecs are installed.
@@ -55,7 +63,7 @@
qt5_get_bindir() {
has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
- echo ${EPREFIX}/usr/$(get_libdir)/qt5/bin
+ echo ${EPREFIX}$(qt5_get_libdir)/qt5/bin
}
# @FUNCTION: qt5_get_headerdir
@@ -66,12 +74,20 @@
echo /usr/include/qt5
}
+# @FUNCTION: qt5_get_libdir
+# @DESCRIPTION:
+# Echoes the directory where Qt5 libraries are installed.
+# Does not take EPREFIX into account.
+qt5_get_libdir() {
+ echo /usr/$(get_libdir)
+}
+
# @FUNCTION: qt5_get_mkspecsdir
# @DESCRIPTION:
# Echoes the directory where Qt5 mkspecs are installed.
# Does not take EPREFIX into account.
qt5_get_mkspecsdir() {
- echo /usr/$(get_libdir)/qt5/mkspecs
+ echo $(qt5_get_libdir)/qt5/mkspecs
}
# @FUNCTION: qmake-utils_find_pro_file
@@ -233,9 +249,9 @@
QMAKE_LFLAGS="${LDFLAGS}" \
QMAKE_LFLAGS_RELEASE= \
QMAKE_LFLAGS_DEBUG= \
- QMAKE_LIBDIR_QT="${EPREFIX}"/usr/$(get_libdir)/qt4 \
- QMAKE_LIBDIR_X11="${EPREFIX}"/usr/$(get_libdir) \
- QMAKE_LIBDIR_OPENGL="${EPREFIX}"/usr/$(get_libdir) \
+ QMAKE_LIBDIR_QT="${EPREFIX}$(qt4_get_libdir)" \
+ QMAKE_LIBDIR_X11="${EPREFIX}/usr/$(get_libdir)" \
+ QMAKE_LIBDIR_OPENGL="${EPREFIX}/usr/$(get_libdir)" \
"${qmake_args[@]}"
if ! eend $? ; then
^ permalink raw reply [flat|nested] 10+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qmake-utils.eclass
@ 2015-06-16 17:47 Davide Pesavento (pesa)
0 siblings, 0 replies; 10+ messages in thread
From: Davide Pesavento (pesa) @ 2015-06-16 17:47 UTC (permalink / raw
To: gentoo-commits
pesa 15/06/16 17:47:24
Modified: ChangeLog qmake-utils.eclass
Log:
Use use_if_iuse().
Revision Changes Path
1.1666 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1666&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1666&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1665&r2=1.1666
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1665
retrieving revision 1.1666
diff -u -r1.1665 -r1.1666
--- ChangeLog 15 Jun 2015 21:09:06 -0000 1.1665
+++ ChangeLog 16 Jun 2015 17:47:24 -0000 1.1666
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1665 2015/06/15 21:09:06 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1666 2015/06/16 17:47:24 pesa Exp $
+
+ 16 Jun 2015; Davide Pesavento <pesa@gentoo.org> qmake-utils.eclass:
+ Use use_if_iuse().
15 Jun 2015; James Le Cuirot <chewi@gentoo.org> java-utils-2.eclass:
Add java-pkg_addres function for adding resource files to an existing jar.
1.10 eclass/qmake-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.9&r2=1.10
Index: qmake-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qmake-utils.eclass 31 May 2015 12:51:07 -0000 1.9
+++ qmake-utils.eclass 16 Jun 2015 17:47:24 -0000 1.10
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.9 2015/05/31 12:51:07 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.10 2015/06/16 17:47:24 pesa Exp $
# @ECLASS: qmake-utils.eclass
# @MAINTAINER:
@@ -141,14 +141,13 @@
local qmake_args=("$@")
- # check if project file was passed as a first argument
- # if not, then search for it
+ # Check if the project file name was passed as first argument. If not, look for candidates.
local regexp='.*\.pro'
if ! [[ ${1} =~ ${regexp} ]]; then
local project_file=$(qmake-utils_find_pro_file)
if [[ -z ${project_file} ]]; then
echo
- eerror "No project files found in '${PWD}'!"
+ eerror "No project files found in '${PWD}'"
eerror "This shouldn't happen - please send a bug report to https://bugs.gentoo.org/"
echo
die "eqmake4 failed"
@@ -156,13 +155,12 @@
qmake_args+=("${project_file}")
fi
- # make sure CONFIG variable is correctly set
- # for both release and debug builds
- local config_add="release"
- local config_remove="debug"
- if has debug ${IUSE} && use debug; then
- config_add="debug"
- config_remove="release"
+ # Make sure the CONFIG variable is correctly set for both release and debug builds.
+ local config_add=release
+ local config_remove=debug
+ if use_if_iuse debug; then
+ config_add=debug
+ config_remove=release
fi
local awkscript='BEGIN {
@@ -240,7 +238,6 @@
QMAKE_LIBDIR_OPENGL="${EPREFIX}"/usr/$(get_libdir) \
"${qmake_args[@]}"
- # was qmake successful?
if ! eend $? ; then
echo
eerror "Running qmake has failed! (see above for details)"
@@ -288,7 +285,6 @@
QMAKE_LFLAGS_DEBUG= \
"$@"
- # was qmake successful?
if ! eend $? ; then
echo
eerror "Running qmake has failed! (see above for details)"
^ permalink raw reply [flat|nested] 10+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qmake-utils.eclass
@ 2015-05-10 15:24 Davide Pesavento (pesa)
0 siblings, 0 replies; 10+ messages in thread
From: Davide Pesavento (pesa) @ 2015-05-10 15:24 UTC (permalink / raw
To: gentoo-commits
pesa 15/05/10 15:24:30
Modified: ChangeLog qmake-utils.eclass
Log:
Don't prepend EPREFIX for {header,mkspecs}dir since these are mostly used with insinto and friends.
Revision Changes Path
1.1613 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1613&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1613&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1612&r2=1.1613
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1612
retrieving revision 1.1613
diff -u -r1.1612 -r1.1613
--- ChangeLog 10 May 2015 14:47:55 -0000 1.1612
+++ ChangeLog 10 May 2015 15:24:30 -0000 1.1613
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1612 2015/05/10 14:47:55 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1613 2015/05/10 15:24:30 pesa Exp $
+
+ 10 May 2015; Davide Pesavento <pesa@gentoo.org> qmake-utils.eclass:
+ Don't prepend EPREFIX for {header,mkspecs}dir since these are mostly used
+ with insinto and friends.
10 May 2015; Davide Pesavento <pesa@gentoo.org> qmake-utils.eclass:
Add qt{4,5}_get_{header,mkspecs}dir helper functions, bug 525830.
1.8 eclass/qmake-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.7&r2=1.8
Index: qmake-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qmake-utils.eclass 10 May 2015 14:47:55 -0000 1.7
+++ qmake-utils.eclass 10 May 2015 15:24:30 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.7 2015/05/10 14:47:55 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.8 2015/05/10 15:24:30 pesa Exp $
# @ECLASS: qmake-utils.eclass
# @MAINTAINER:
@@ -20,6 +20,8 @@
# @DESCRIPTION:
# Echoes the directory where Qt4 binaries are installed.
qt4_get_bindir() {
+ has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
+
local qtbindir=${EPREFIX}/usr/$(get_libdir)/qt4/bin
if [[ -d ${qtbindir} ]]; then
echo ${qtbindir}
@@ -31,36 +33,42 @@
# @FUNCTION: qt4_get_headerdir
# @DESCRIPTION:
# Echoes the directory where Qt4 headers are installed.
+# Does not take EPREFIX into account.
qt4_get_headerdir() {
- echo ${EPREFIX}/usr/include/qt4
+ echo /usr/include/qt4
}
# @FUNCTION: qt4_get_mkspecsdir
# @DESCRIPTION:
# Echoes the directory where Qt4 mkspecs are installed.
+# Does not take EPREFIX into account.
qt4_get_mkspecsdir() {
- echo ${EPREFIX}/usr/share/qt4/mkspecs
+ echo /usr/share/qt4/mkspecs
}
# @FUNCTION: qt5_get_bindir
# @DESCRIPTION:
# Echoes the directory where Qt5 binaries are installed.
qt5_get_bindir() {
+ has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
+
echo ${EPREFIX}/usr/$(get_libdir)/qt5/bin
}
# @FUNCTION: qt5_get_headerdir
# @DESCRIPTION:
# Echoes the directory where Qt5 headers are installed.
+# Does not take EPREFIX into account.
qt5_get_headerdir() {
- echo ${EPREFIX}/usr/include/qt5
+ echo /usr/include/qt5
}
# @FUNCTION: qt5_get_mkspecsdir
# @DESCRIPTION:
# Echoes the directory where Qt5 mkspecs are installed.
+# Does not take EPREFIX into account.
qt5_get_mkspecsdir() {
- echo ${EPREFIX}/usr/$(get_libdir)/qt5/mkspecs
+ echo /usr/$(get_libdir)/qt5/mkspecs
}
# @FUNCTION: qmake-utils_find_pro_file
@@ -252,8 +260,6 @@
eqmake5() {
debug-print-function ${FUNCNAME} "$@"
- has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
-
ebegin "Running qmake"
"$(qt5_get_bindir)"/qmake \
^ permalink raw reply [flat|nested] 10+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qmake-utils.eclass
@ 2015-05-10 14:47 Davide Pesavento (pesa)
0 siblings, 0 replies; 10+ messages in thread
From: Davide Pesavento (pesa) @ 2015-05-10 14:47 UTC (permalink / raw
To: gentoo-commits
pesa 15/05/10 14:47:55
Modified: ChangeLog qmake-utils.eclass
Log:
Add qt{4,5}_get_{header,mkspecs}dir helper functions, bug 525830.
Revision Changes Path
1.1612 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1612&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1612&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1611&r2=1.1612
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1611
retrieving revision 1.1612
diff -u -r1.1611 -r1.1612
--- ChangeLog 10 May 2015 01:06:49 -0000 1.1611
+++ ChangeLog 10 May 2015 14:47:55 -0000 1.1612
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1611 2015/05/10 01:06:49 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1612 2015/05/10 14:47:55 pesa Exp $
+
+ 10 May 2015; Davide Pesavento <pesa@gentoo.org> qmake-utils.eclass:
+ Add qt{4,5}_get_{header,mkspecs}dir helper functions, bug 525830.
10 May 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
Delete obsolete code that is now causing problems on freebsd (bug 493310).
1.7 eclass/qmake-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.6&r2=1.7
Index: qmake-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qmake-utils.eclass 26 Feb 2015 01:52:15 -0000 1.6
+++ qmake-utils.eclass 10 May 2015 14:47:55 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.6 2015/02/26 01:52:15 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.7 2015/05/10 14:47:55 pesa Exp $
# @ECLASS: qmake-utils.eclass
# @MAINTAINER:
@@ -28,6 +28,20 @@
fi
}
+# @FUNCTION: qt4_get_headerdir
+# @DESCRIPTION:
+# Echoes the directory where Qt4 headers are installed.
+qt4_get_headerdir() {
+ echo ${EPREFIX}/usr/include/qt4
+}
+
+# @FUNCTION: qt4_get_mkspecsdir
+# @DESCRIPTION:
+# Echoes the directory where Qt4 mkspecs are installed.
+qt4_get_mkspecsdir() {
+ echo ${EPREFIX}/usr/share/qt4/mkspecs
+}
+
# @FUNCTION: qt5_get_bindir
# @DESCRIPTION:
# Echoes the directory where Qt5 binaries are installed.
@@ -35,6 +49,20 @@
echo ${EPREFIX}/usr/$(get_libdir)/qt5/bin
}
+# @FUNCTION: qt5_get_headerdir
+# @DESCRIPTION:
+# Echoes the directory where Qt5 headers are installed.
+qt5_get_headerdir() {
+ echo ${EPREFIX}/usr/include/qt5
+}
+
+# @FUNCTION: qt5_get_mkspecsdir
+# @DESCRIPTION:
+# Echoes the directory where Qt5 mkspecs are installed.
+qt5_get_mkspecsdir() {
+ echo ${EPREFIX}/usr/$(get_libdir)/qt5/mkspecs
+}
+
# @FUNCTION: qmake-utils_find_pro_file
# @RETURN: zero or one qmake .pro file names
# @INTERNAL
^ permalink raw reply [flat|nested] 10+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qmake-utils.eclass
@ 2015-02-26 1:52 Ben de Groot (yngwin)
0 siblings, 0 replies; 10+ messages in thread
From: Ben de Groot (yngwin) @ 2015-02-26 1:52 UTC (permalink / raw
To: gentoo-commits
yngwin 15/02/26 01:52:15
Modified: ChangeLog qmake-utils.eclass
Log:
add qt{4,5}_get_bindir helper functions
Revision Changes Path
1.1555 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1555&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1555&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1554&r2=1.1555
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1554
retrieving revision 1.1555
diff -u -r1.1554 -r1.1555
--- ChangeLog 24 Feb 2015 12:14:26 -0000 1.1554
+++ ChangeLog 26 Feb 2015 01:52:15 -0000 1.1555
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1554 2015/02/24 12:14:26 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1555 2015/02/26 01:52:15 yngwin Exp $
+
+ 26 Feb 2015; Ben de Groot <yngwin@gentoo.org> qmake-utils.eclass:
+ add qt{4,5}_get_bindir helper functions
24 Feb 2015; Anthony G. Basile <blueness@gentoo.org> bitcoincore.eclass:
bitcoincore.eclass: update spamfilter message, bug #541192.
1.6 eclass/qmake-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.5&r2=1.6
Index: qmake-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qmake-utils.eclass 17 Nov 2014 02:15:42 -0000 1.5
+++ qmake-utils.eclass 26 Feb 2015 01:52:15 -0000 1.6
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.5 2014/11/17 02:15:42 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.6 2015/02/26 01:52:15 yngwin Exp $
# @ECLASS: qmake-utils.eclass
# @MAINTAINER:
@@ -16,6 +16,25 @@
inherit eutils multilib toolchain-funcs
+# @FUNCTION: qt4_get_bindir
+# @DESCRIPTION:
+# Echoes the directory where Qt4 binaries are installed.
+qt4_get_bindir() {
+ local qtbindir=${EPREFIX}/usr/$(get_libdir)/qt4/bin
+ if [[ -d ${qtbindir} ]]; then
+ echo ${qtbindir}
+ else
+ echo ${EPREFIX}/usr/bin
+ fi
+}
+
+# @FUNCTION: qt5_get_bindir
+# @DESCRIPTION:
+# Echoes the directory where Qt5 binaries are installed.
+qt5_get_bindir() {
+ echo ${EPREFIX}/usr/$(get_libdir)/qt5/bin
+}
+
# @FUNCTION: qmake-utils_find_pro_file
# @RETURN: zero or one qmake .pro file names
# @INTERNAL
@@ -158,11 +177,7 @@
[[ -n ${EQMAKE4_EXCLUDE} ]] && eshopts_pop
- # determine qmake binary location
- local qmake_path=${EPREFIX}/usr/$(get_libdir)/qt4/bin/qmake
- [[ ! -x ${qmake_path} ]] && qmake_path=${EPREFIX}/usr/bin/qmake
-
- "${qmake_path}" \
+ "$(qt4_get_bindir)"/qmake \
-makefile \
QMAKE_AR="$(tc-getAR) cqs" \
QMAKE_CC="$(tc-getCC)" \
@@ -213,7 +228,7 @@
ebegin "Running qmake"
- "${EPREFIX}"/usr/$(get_libdir)/qt5/bin/qmake \
+ "$(qt5_get_bindir)"/qmake \
-makefile \
QMAKE_AR="$(tc-getAR) cqs" \
QMAKE_CC="$(tc-getCC)" \
^ permalink raw reply [flat|nested] 10+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qmake-utils.eclass
@ 2014-11-01 23:39 Davide Pesavento (pesa)
0 siblings, 0 replies; 10+ messages in thread
From: Davide Pesavento (pesa) @ 2014-11-01 23:39 UTC (permalink / raw
To: gentoo-commits
pesa 14/11/01 23:39:05
Modified: ChangeLog qmake-utils.eclass
Log:
eqmake4(): support new qmake install location.
Revision Changes Path
1.1399 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1399&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1399&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1398&r2=1.1399
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1398
retrieving revision 1.1399
diff -u -r1.1398 -r1.1399
--- ChangeLog 1 Nov 2014 17:34:28 -0000 1.1398
+++ ChangeLog 1 Nov 2014 23:39:05 -0000 1.1399
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1398 2014/11/01 17:34:28 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1399 2014/11/01 23:39:05 pesa Exp $
+
+ 01 Nov 2014; Davide Pesavento <pesa@gentoo.org> qmake-utils.eclass:
+ eqmake4(): support new qmake install location (patch by mgorny).
01 Nov 2014; Andreas K. Huettel <dilfridge@gentoo.org> perl-module.eclass:
Drop EAPI=0,1,2,3 support in perl-module.eclass, this time for real. Further
1.4 eclass/qmake-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.3&r2=1.4
Index: qmake-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qmake-utils.eclass 28 Jul 2014 21:19:52 -0000 1.3
+++ qmake-utils.eclass 1 Nov 2014 23:39:05 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.3 2014/07/28 21:19:52 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.4 2014/11/01 23:39:05 pesa Exp $
# @ECLASS: qmake-utils.eclass
# @MAINTAINER:
@@ -158,10 +158,13 @@
[[ -n ${EQMAKE4_EXCLUDE} ]] && eshopts_pop
- "${EPREFIX}"/usr/bin/qmake \
+ # determine qmake binary location
+ local qmake_path=${EPREFIX}/usr/$(get_libdir)/qt4/bin/qmake
+ [[ ! -x ${qmake_path} ]] && qmake_path=${EPREFIX}/usr/bin/qmake
+
+ "${qmake_path}" \
-makefile \
QTDIR="${EPREFIX}"/usr/$(get_libdir) \
- QMAKE="${EPREFIX}"/usr/bin/qmake \
QMAKE_AR="$(tc-getAR) cqs" \
QMAKE_CC="$(tc-getCC)" \
QMAKE_CXX="$(tc-getCXX)" \
^ permalink raw reply [flat|nested] 10+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qmake-utils.eclass
@ 2014-07-28 21:19 Davide Pesavento (pesa)
0 siblings, 0 replies; 10+ messages in thread
From: Davide Pesavento (pesa) @ 2014-07-28 21:19 UTC (permalink / raw
To: gentoo-commits
pesa 14/07/28 21:19:52
Modified: ChangeLog qmake-utils.eclass
Log:
Set also QMAKE_LINK_{C_,}SHLIB
Revision Changes Path
1.1329 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1329&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1329&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1328&r2=1.1329
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1328
retrieving revision 1.1329
diff -u -r1.1328 -r1.1329
--- ChangeLog 28 Jul 2014 20:59:07 -0000 1.1328
+++ ChangeLog 28 Jul 2014 21:19:52 -0000 1.1329
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1328 2014/07/28 20:59:07 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1329 2014/07/28 21:19:52 pesa Exp $
+
+ 28 Jul 2014; Davide Pesavento <pesa@gentoo.org> qmake-utils.eclass:
+ Set also QMAKE_LINK_{C_,}SHLIB
28 Jul 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org> +mozconfig-v4.eclass:
committed new mozconfig eclass for mozilla31 and later
1.3 eclass/qmake-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.2&r2=1.3
Index: qmake-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qmake-utils.eclass 11 Jul 2014 08:21:58 -0000 1.2
+++ qmake-utils.eclass 28 Jul 2014 21:19:52 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.2 2014/07/11 08:21:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.3 2014/07/28 21:19:52 pesa Exp $
# @ECLASS: qmake-utils.eclass
# @MAINTAINER:
@@ -215,9 +215,11 @@
-makefile \
QMAKE_AR="$(tc-getAR) cqs" \
QMAKE_CC="$(tc-getCC)" \
+ QMAKE_LINK_C="$(tc-getCC)" \
+ QMAKE_LINK_C_SHLIB="$(tc-getCC)" \
QMAKE_CXX="$(tc-getCXX)" \
QMAKE_LINK="$(tc-getCXX)" \
- QMAKE_LINK_C="$(tc-getCC)" \
+ QMAKE_LINK_SHLIB="$(tc-getCXX)" \
QMAKE_OBJCOPY="$(tc-getOBJCOPY)" \
QMAKE_RANLIB= \
QMAKE_STRIP= \
^ permalink raw reply [flat|nested] 10+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qmake-utils.eclass
@ 2013-12-02 9:42 Sergey Popov (pinkbyte)
0 siblings, 0 replies; 10+ messages in thread
From: Sergey Popov (pinkbyte) @ 2013-12-02 9:42 UTC (permalink / raw
To: gentoo-commits
pinkbyte 13/12/02 09:42:38
Modified: ChangeLog
Added: qmake-utils.eclass
Log:
Add qmake-utils eclass from Qt overlay
Revision Changes Path
1.1076 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1076&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1076&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1075&r2=1.1076
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1075
retrieving revision 1.1076
diff -u -r1.1075 -r1.1076
--- ChangeLog 1 Dec 2013 19:11:24 -0000 1.1075
+++ ChangeLog 2 Dec 2013 09:42:38 -0000 1.1076
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1075 2013/12/01 19:11:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1076 2013/12/02 09:42:38 pinkbyte Exp $
+
+ 02 Dec 2013; Sergey Popov <pinkbyte@gentoo.org> +qmake-utils.eclass:
+ Add qmake-utils eclass from Qt overlay
01 Dec 2013; Robin H. Johnson <robbat2@gentoo.org> linux-mod.eclass:
Always ensure MODULES_OPTIONAL_USE is in IUSE.
1.1 eclass/qmake-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.1&content-type=text/plain
Index: qmake-utils.eclass
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.1 2013/12/02 09:42:38 pinkbyte Exp $
# @ECLASS: qmake-utils.eclass
# @MAINTAINER:
# Qt herd <qt@gentoo.org>
# @AUTHOR:
# Davide Pesavento <pesa@gentoo.org>
# @BLURB: Common functions for qmake-based packages.
# @DESCRIPTION:
# Utility eclass providing wrapper functions for Qt4 and Qt5 qmake.
if [[ ${___ECLASS_ONCE_QMAKE_UTILS} != "recur -_+^+_- spank" ]]; then
___ECLASS_ONCE_QMAKE_UTILS="recur -_+^+_- spank"
inherit eutils multilib toolchain-funcs
# @FUNCTION: qmake-utils_find_pro_file
# @RETURN: zero or one qmake .pro file names
# @INTERNAL
# @DESCRIPTION:
# Outputs a project file name that can be passed to eqmake.
# 0 *.pro files found --> outputs null string;
# 1 *.pro file found --> outputs its name;
# 2 or more *.pro files found --> if "${PN}.pro" or
# "$(basename ${S}).pro" are there, outputs one of them.
qmake-utils_find_pro_file() {
local dir_name=$(basename "${S}")
# set nullglob to avoid expanding *.pro to the literal
# string "*.pro" when there are no matching files
eshopts_push -s nullglob
local pro_files=(*.pro)
eshopts_pop
case ${#pro_files[@]} in
0)
: ;;
1)
echo "${pro_files}"
;;
*)
for pro_file in "${pro_files[@]}"; do
if [[ ${pro_file%.pro} == ${dir_name} || ${pro_file%.pro} == ${PN} ]]; then
echo "${pro_file}"
break
fi
done
;;
esac
}
# @VARIABLE: EQMAKE4_EXCLUDE
# @DEFAULT_UNSET
# @DESCRIPTION:
# List of files to be excluded from eqmake4 CONFIG processing.
# Paths are relative to the current working directory (usually ${S}).
#
# Example: EQMAKE4_EXCLUDE="ignore/me.pro foo/*"
# @FUNCTION: eqmake4
# @USAGE: [project_file] [parameters to qmake]
# @DESCRIPTION:
# Wrapper for Qt4's qmake. If project_file isn't specified, eqmake4 will
# look for it in the current directory (${S}, non-recursively). If more
# than one project file are found, then ${PN}.pro is processed, provided
# that it exists. Otherwise eqmake4 fails.
#
# All other arguments are appended unmodified to qmake command line.
#
# For recursive build systems, i.e. those based on the subdirs template,
# you should run eqmake4 on the top-level project file only, unless you
# have a valid reason to do otherwise. During the building, qmake will
# be automatically re-invoked with the right arguments on every directory
# specified inside the top-level project file.
eqmake4() {
debug-print-function ${FUNCNAME} "$@"
has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
ebegin "Running qmake"
local qmake_args=("$@")
# check if project file was passed as a first argument
# if not, then search for it
local regexp='.*\.pro'
if ! [[ ${1} =~ ${regexp} ]]; then
local project_file=$(qmake-utils_find_pro_file)
if [[ -z ${project_file} ]]; then
echo
eerror "No project files found in '${PWD}'!"
eerror "This shouldn't happen - please send a bug report to https://bugs.gentoo.org/"
echo
die "eqmake4 failed"
fi
qmake_args+=("${project_file}")
fi
# make sure CONFIG variable is correctly set
# for both release and debug builds
local config_add="release"
local config_remove="debug"
if has debug ${IUSE} && use debug; then
config_add="debug"
config_remove="release"
fi
local awkscript='BEGIN {
printf "### eqmake4 was here ###\n" > file;
printf "CONFIG -= debug_and_release %s\n", remove >> file;
printf "CONFIG += %s\n\n", add >> file;
fixed=0;
}
/^[[:blank:]]*CONFIG[[:blank:]]*[\+\*]?=/ {
if (gsub("\\<((" remove ")|(debug_and_release))\\>", "") > 0) {
fixed=1;
}
}
/^[[:blank:]]*CONFIG[[:blank:]]*-=/ {
if (gsub("\\<" add "\\>", "") > 0) {
fixed=1;
}
}
{
print >> file;
}
END {
print fixed;
}'
[[ -n ${EQMAKE4_EXCLUDE} ]] && eshopts_push -o noglob
local file
while read file; do
local excl
for excl in ${EQMAKE4_EXCLUDE}; do
[[ ${file} == ${excl} ]] && continue 2
done
grep -q '^### eqmake4 was here ###$' "${file}" && continue
local retval=$({
rm -f "${file}" || echo FAIL
awk -v file="${file}" \
-v add=${config_add} \
-v remove=${config_remove} \
-- "${awkscript}" || echo FAIL
} < "${file}")
if [[ ${retval} == 1 ]]; then
einfo " - fixed CONFIG in ${file}"
elif [[ ${retval} != 0 ]]; then
eerror " - error while processing ${file}"
die "eqmake4 failed to process ${file}"
fi
done < <(find . -type f -name '*.pr[io]' -printf '%P\n' 2>/dev/null)
[[ -n ${EQMAKE4_EXCLUDE} ]] && eshopts_pop
"${EPREFIX}"/usr/bin/qmake \
-makefile \
QTDIR="${EPREFIX}"/usr/$(get_libdir) \
QMAKE="${EPREFIX}"/usr/bin/qmake \
QMAKE_AR="$(tc-getAR) cqs" \
QMAKE_CC="$(tc-getCC)" \
QMAKE_CXX="$(tc-getCXX)" \
QMAKE_LINK="$(tc-getCXX)" \
QMAKE_LINK_C="$(tc-getCC)" \
QMAKE_OBJCOPY="$(tc-getOBJCOPY)" \
QMAKE_RANLIB= \
QMAKE_STRIP= \
QMAKE_CFLAGS="${CFLAGS}" \
QMAKE_CFLAGS_RELEASE= \
QMAKE_CFLAGS_DEBUG= \
QMAKE_CXXFLAGS="${CXXFLAGS}" \
QMAKE_CXXFLAGS_RELEASE= \
QMAKE_CXXFLAGS_DEBUG= \
QMAKE_LFLAGS="${LDFLAGS}" \
QMAKE_LFLAGS_RELEASE= \
QMAKE_LFLAGS_DEBUG= \
QMAKE_LIBDIR_QT="${EPREFIX}"/usr/$(get_libdir)/qt4 \
QMAKE_LIBDIR_X11="${EPREFIX}"/usr/$(get_libdir) \
QMAKE_LIBDIR_OPENGL="${EPREFIX}"/usr/$(get_libdir) \
"${qmake_args[@]}"
# was qmake successful?
if ! eend $? ; then
echo
eerror "Running qmake has failed! (see above for details)"
eerror "This shouldn't happen - please send a bug report to https://bugs.gentoo.org/"
echo
die "eqmake4 failed"
fi
}
# @FUNCTION: eqmake5
# @USAGE: [arguments for qmake]
# @DESCRIPTION:
# Wrapper for Qt5's qmake. All arguments are passed to qmake.
#
# For recursive build systems, i.e. those based on the subdirs template,
# you should run eqmake5 on the top-level project file only, unless you
# have a valid reason to do otherwise. During the building, qmake will
# be automatically re-invoked with the right arguments on every directory
# specified inside the top-level project file.
eqmake5() {
debug-print-function ${FUNCNAME} "$@"
has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
ebegin "Running qmake"
"${EPREFIX}"/usr/$(get_libdir)/qt5/bin/qmake \
-makefile \
QMAKE_AR="$(tc-getAR) cqs" \
QMAKE_CC="$(tc-getCC)" \
QMAKE_CXX="$(tc-getCXX)" \
QMAKE_LINK="$(tc-getCXX)" \
QMAKE_LINK_C="$(tc-getCC)" \
QMAKE_OBJCOPY="$(tc-getOBJCOPY)" \
QMAKE_RANLIB= \
QMAKE_STRIP= \
QMAKE_CFLAGS="${CFLAGS}" \
QMAKE_CFLAGS_RELEASE= \
QMAKE_CFLAGS_DEBUG= \
QMAKE_CXXFLAGS="${CXXFLAGS}" \
QMAKE_CXXFLAGS_RELEASE= \
QMAKE_CXXFLAGS_DEBUG= \
QMAKE_LFLAGS="${LDFLAGS}" \
QMAKE_LFLAGS_RELEASE= \
QMAKE_LFLAGS_DEBUG= \
"$@"
# was qmake successful?
if ! eend $? ; then
echo
eerror "Running qmake has failed! (see above for details)"
eerror "This shouldn't happen - please send a bug report to https://bugs.gentoo.org/"
echo
die "eqmake5 failed"
fi
}
fi
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2015-06-29 0:27 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-17 2:15 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qmake-utils.eclass Davide Pesavento (pesa)
-- strict thread matches above, loose matches on Subject: below --
2015-06-29 0:27 Davide Pesavento (pesa)
2015-06-22 14:18 Davide Pesavento (pesa)
2015-06-16 17:47 Davide Pesavento (pesa)
2015-05-10 15:24 Davide Pesavento (pesa)
2015-05-10 14:47 Davide Pesavento (pesa)
2015-02-26 1:52 Ben de Groot (yngwin)
2014-11-01 23:39 Davide Pesavento (pesa)
2014-07-28 21:19 Davide Pesavento (pesa)
2013-12-02 9:42 Sergey Popov (pinkbyte)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox