[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qmake-utils.eclass
pesa15/06/29 00:27:17
Modified: ChangeLog qmake-utils.eclass
Log:
Introduce qt{4,5}_get_plugindir(). Rephrase some eclass doc.
Revision ChangesPath
1.1694 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1694view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1694content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1693r2=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 - 1.1693
+++ ChangeLog 29 Jun 2015 00:27:17 - 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 p...@gentoo.org qmake-utils.eclass:
+ Introduce qt{4,5}_get_plugindir(). Rephrase some eclass doc.
28 Jun 2015; James Le Cuirot ch...@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.12view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.12content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.11r2=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 - 1.11
+++ qmake-utils.eclass 29 Jun 2015 00:27:17 - 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
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qmake-utils.eclass
pesa15/06/22 14:18:19
Modified: ChangeLog qmake-utils.eclass
Log:
Introduce qt{4,5}_get_libdir().
Revision ChangesPath
1.1678 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1678view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1678content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1677r2=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 - 1.1677
+++ ChangeLog 22 Jun 2015 14:18:19 - 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 p...@gentoo.org qmake-utils.eclass:
+ Introduce qt{4,5}_get_libdir().
22 Jun 2015; Manuel Rüger mr...@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.11view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.11content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.10r2=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 - 1.10
+++ qmake-utils.eclass 22 Jun 2015 14:18:19 - 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
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qmake-utils.eclass
pesa15/06/16 17:47:24
Modified: ChangeLog qmake-utils.eclass
Log:
Use use_if_iuse().
Revision ChangesPath
1.1666 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1666view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1666content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1665r2=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 - 1.1665
+++ ChangeLog 16 Jun 2015 17:47:24 - 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 p...@gentoo.org qmake-utils.eclass:
+ Use use_if_iuse().
15 Jun 2015; James Le Cuirot ch...@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.10view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.10content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.9r2=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 - 1.9
+++ qmake-utils.eclass 16 Jun 2015 17:47:24 - 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)
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qmake-utils.eclass
pesa15/05/10 14:47:55
Modified: ChangeLog qmake-utils.eclass
Log:
Add qt{4,5}_get_{header,mkspecs}dir helper functions, bug 525830.
Revision ChangesPath
1.1612 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1612view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1612content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1611r2=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 - 1.1611
+++ ChangeLog 10 May 2015 14:47:55 - 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 p...@gentoo.org qmake-utils.eclass:
+ Add qt{4,5}_get_{header,mkspecs}dir helper functions, bug 525830.
10 May 2015; Davide Pesavento p...@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.7view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.7content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.6r2=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 - 1.6
+++ qmake-utils.eclass 10 May 2015 14:47:55 - 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
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qmake-utils.eclass
pesa15/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 ChangesPath
1.1613 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1613view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1613content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1612r2=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 - 1.1612
+++ ChangeLog 10 May 2015 15:24:30 - 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 p...@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 p...@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.8view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.8content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.7r2=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 - 1.7
+++ qmake-utils.eclass 10 May 2015 15:24:30 - 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 \
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qmake-utils.eclass
yngwin 15/02/26 01:52:15
Modified: ChangeLog qmake-utils.eclass
Log:
add qt{4,5}_get_bindir helper functions
Revision ChangesPath
1.1555 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1555view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1555content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1554r2=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 - 1.1554
+++ ChangeLog 26 Feb 2015 01:52:15 - 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 yng...@gentoo.org qmake-utils.eclass:
+ add qt{4,5}_get_bindir helper functions
24 Feb 2015; Anthony G. Basile bluen...@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.6view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.6content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.5r2=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 - 1.5
+++ qmake-utils.eclass 26 Feb 2015 01:52:15 - 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) \
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qmake-utils.eclass
pesa14/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 ChangesPath
1.1425 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1425view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1425content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1424r2=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 - 1.1424
+++ ChangeLog 17 Nov 2014 02:15:42 - 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 p...@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 p...@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.5view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.5content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.4r2=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 - 1.4
+++ qmake-utils.eclass 17 Nov 2014 02:15:42 - 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) \
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qmake-utils.eclass
pesa14/11/01 23:39:05
Modified: ChangeLog qmake-utils.eclass
Log:
eqmake4(): support new qmake install location.
Revision ChangesPath
1.1399 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1399view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1399content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1398r2=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 - 1.1398
+++ ChangeLog 1 Nov 2014 23:39:05 - 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 p...@gentoo.org qmake-utils.eclass:
+ eqmake4(): support new qmake install location (patch by mgorny).
01 Nov 2014; Andreas K. Huettel dilfri...@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.4view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.4content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.3r2=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 - 1.3
+++ qmake-utils.eclass 1 Nov 2014 23:39:05 - 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) \
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qmake-utils.eclass
pesa14/07/28 21:19:52
Modified: ChangeLog qmake-utils.eclass
Log:
Set also QMAKE_LINK_{C_,}SHLIB
Revision ChangesPath
1.1329 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1329view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1329content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1328r2=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 - 1.1328
+++ ChangeLog 28 Jul 2014 21:19:52 - 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 p...@gentoo.org qmake-utils.eclass:
+ Set also QMAKE_LINK_{C_,}SHLIB
28 Jul 2014; Ian Stakenvicius (_AxS_) a...@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.3view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.3content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.2r2=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 - 1.2
+++ qmake-utils.eclass 28 Jul 2014 21:19:52 - 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= \
