| 1 |
yngwin 15/02/26 01:52:15 |
| 2 |
|
| 3 |
Modified: ChangeLog qmake-utils.eclass |
| 4 |
Log: |
| 5 |
add qt{4,5}_get_bindir helper functions |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1555 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1555&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1555&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1554&r2=1.1555 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1554 |
| 18 |
retrieving revision 1.1555 |
| 19 |
diff -u -r1.1554 -r1.1555 |
| 20 |
--- ChangeLog 24 Feb 2015 12:14:26 -0000 1.1554 |
| 21 |
+++ ChangeLog 26 Feb 2015 01:52:15 -0000 1.1555 |
| 22 |
@@ -1,6 +1,9 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1554 2015/02/24 12:14:26 blueness Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1555 2015/02/26 01:52:15 yngwin Exp $ |
| 27 |
+ |
| 28 |
+ 26 Feb 2015; Ben de Groot <yngwin@g.o> qmake-utils.eclass: |
| 29 |
+ add qt{4,5}_get_bindir helper functions |
| 30 |
|
| 31 |
24 Feb 2015; Anthony G. Basile <blueness@g.o> bitcoincore.eclass: |
| 32 |
bitcoincore.eclass: update spamfilter message, bug #541192. |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.6 eclass/qmake-utils.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.6&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.6&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.5&r2=1.6 |
| 41 |
|
| 42 |
Index: qmake-utils.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v |
| 45 |
retrieving revision 1.5 |
| 46 |
retrieving revision 1.6 |
| 47 |
diff -u -r1.5 -r1.6 |
| 48 |
--- qmake-utils.eclass 17 Nov 2014 02:15:42 -0000 1.5 |
| 49 |
+++ qmake-utils.eclass 26 Feb 2015 01:52:15 -0000 1.6 |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
-# Copyright 1999-2014 Gentoo Foundation |
| 52 |
+# Copyright 1999-2015 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.5 2014/11/17 02:15:42 pesa Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.6 2015/02/26 01:52:15 yngwin Exp $ |
| 56 |
|
| 57 |
# @ECLASS: qmake-utils.eclass |
| 58 |
# @MAINTAINER: |
| 59 |
@@ -16,6 +16,25 @@ |
| 60 |
|
| 61 |
inherit eutils multilib toolchain-funcs |
| 62 |
|
| 63 |
+# @FUNCTION: qt4_get_bindir |
| 64 |
+# @DESCRIPTION: |
| 65 |
+# Echoes the directory where Qt4 binaries are installed. |
| 66 |
+qt4_get_bindir() { |
| 67 |
+ local qtbindir=${EPREFIX}/usr/$(get_libdir)/qt4/bin |
| 68 |
+ if [[ -d ${qtbindir} ]]; then |
| 69 |
+ echo ${qtbindir} |
| 70 |
+ else |
| 71 |
+ echo ${EPREFIX}/usr/bin |
| 72 |
+ fi |
| 73 |
+} |
| 74 |
+ |
| 75 |
+# @FUNCTION: qt5_get_bindir |
| 76 |
+# @DESCRIPTION: |
| 77 |
+# Echoes the directory where Qt5 binaries are installed. |
| 78 |
+qt5_get_bindir() { |
| 79 |
+ echo ${EPREFIX}/usr/$(get_libdir)/qt5/bin |
| 80 |
+} |
| 81 |
+ |
| 82 |
# @FUNCTION: qmake-utils_find_pro_file |
| 83 |
# @RETURN: zero or one qmake .pro file names |
| 84 |
# @INTERNAL |
| 85 |
@@ -158,11 +177,7 @@ |
| 86 |
|
| 87 |
[[ -n ${EQMAKE4_EXCLUDE} ]] && eshopts_pop |
| 88 |
|
| 89 |
- # determine qmake binary location |
| 90 |
- local qmake_path=${EPREFIX}/usr/$(get_libdir)/qt4/bin/qmake |
| 91 |
- [[ ! -x ${qmake_path} ]] && qmake_path=${EPREFIX}/usr/bin/qmake |
| 92 |
- |
| 93 |
- "${qmake_path}" \ |
| 94 |
+ "$(qt4_get_bindir)"/qmake \ |
| 95 |
-makefile \ |
| 96 |
QMAKE_AR="$(tc-getAR) cqs" \ |
| 97 |
QMAKE_CC="$(tc-getCC)" \ |
| 98 |
@@ -213,7 +228,7 @@ |
| 99 |
|
| 100 |
ebegin "Running qmake" |
| 101 |
|
| 102 |
- "${EPREFIX}"/usr/$(get_libdir)/qt5/bin/qmake \ |
| 103 |
+ "$(qt5_get_bindir)"/qmake \ |
| 104 |
-makefile \ |
| 105 |
QMAKE_AR="$(tc-getAR) cqs" \ |
| 106 |
QMAKE_CC="$(tc-getCC)" \ |
Archives