| 1 |
commit: f7d35fab009f7f484a7f20ea96c2b2c59d564529 |
| 2 |
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Sep 27 22:37:48 2012 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 27 22:37:48 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f7d35fab |
| 7 |
|
| 8 |
[qt5-build.eclass] Fix my previous commit to work with 5.0.0_beta. |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/qt5-build.eclass | 3 ++- |
| 12 |
1 files changed, 2 insertions(+), 1 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 15 |
index f0eda4a..788dbdc 100644 |
| 16 |
--- a/eclass/qt5-build.eclass |
| 17 |
+++ b/eclass/qt5-build.eclass |
| 18 |
@@ -223,6 +223,7 @@ qt5-build_src_configure() { |
| 19 |
einfo "Running qmake" |
| 20 |
./bin/qmake -recursive \ |
| 21 |
"${S}"/${EGIT_PROJECT}.pro \ |
| 22 |
+ $(version_is_at_least 5.0.0_beta2 || echo "CONFIG+=nostrip") \ |
| 23 |
QMAKE_LIBDIR+="${QT5_BUILD_DIR}/lib" \ |
| 24 |
QMAKE_LIBDIR+="${QTLIBDIR}" \ |
| 25 |
|| die "qmake failed" |
| 26 |
@@ -411,7 +412,7 @@ qt5_base_configure() { |
| 27 |
-verbose $(${QT5_VERBOSE_BUILD} || echo -silent) |
| 28 |
|
| 29 |
# don't strip |
| 30 |
- -no-strip |
| 31 |
+ $(version_is_at_least 5.0.0_beta2 && echo -no-strip) |
| 32 |
|
| 33 |
# precompiled headers don't work on hardened, where the flag is masked |
| 34 |
$(qt_use pch) |
Archives