| 1 |
commit: a158d72f278fe9bfc332cddc7454f09caccd07e6 |
| 2 |
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Jan 1 23:39:23 2013 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 1 23:39:23 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a158d72f |
| 7 |
|
| 8 |
[qt5-build.eclass] Fix qconfig processing: don't assume that ${PN} starts with "qt-". |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/qt5-build.eclass | 7 ++++--- |
| 12 |
1 files changed, 4 insertions(+), 3 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 15 |
index 8c1b6d3..7295c8f 100644 |
| 16 |
--- a/eclass/qt5-build.eclass |
| 17 |
+++ b/eclass/qt5-build.eclass |
| 18 |
@@ -515,8 +515,9 @@ qt5_install_module_qconfigs() { |
| 19 |
qt5_regenerate_global_qconfigs() { |
| 20 |
einfo "Regenerating gentoo-qconfig.h" |
| 21 |
|
| 22 |
- find "${ROOT}${QT5_HEADERDIR}"/Gentoo -name 'qt-*-qconfig.h' -type f \ |
| 23 |
- -exec cat {} + > "${T}"/gentoo-qconfig.h |
| 24 |
+ find "${ROOT}${QT5_HEADERDIR}"/Gentoo \ |
| 25 |
+ -name '*-qconfig.h' -a \! -name 'gentoo-qconfig.h' -type f \ |
| 26 |
+ -execdir cat '{}' + > "${T}"/gentoo-qconfig.h |
| 27 |
|
| 28 |
[[ -s ${T}/gentoo-qconfig.h ]] || ewarn "Generated gentoo-qconfig.h is empty" |
| 29 |
mv -f "${T}"/gentoo-qconfig.h "${ROOT}${QT5_HEADERDIR}"/Gentoo/gentoo-qconfig.h \ |
| 30 |
@@ -533,7 +534,7 @@ qt5_regenerate_global_qconfigs() { |
| 31 |
# generate list of QT_CONFIG entries from the existing list, |
| 32 |
# appending QCONFIG_ADD and excluding QCONFIG_REMOVE |
| 33 |
eshopts_push -s nullglob |
| 34 |
- for x in "${ROOT}${QT5_ARCHDATADIR}"/mkspecs/gentoo/qt-*-qconfig.pri; do |
| 35 |
+ for x in "${ROOT}${QT5_ARCHDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do |
| 36 |
qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")" |
| 37 |
qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")" |
| 38 |
done |
Archives