| 1 |
commit: 84b6a537ba886fca36e0e4d2cbf2d525d1f7d057 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 30 17:23:49 2014 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 1 02:39:56 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=84b6a537 |
| 7 |
|
| 8 |
[qt4-build-multilib.eclass] Respect also AR, OBJCOPY, and STRIP. |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/qt4-build-multilib.eclass | 9 +++++++-- |
| 12 |
1 file changed, 7 insertions(+), 2 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass |
| 15 |
index f19980b..4771381 100644 |
| 16 |
--- a/eclass/qt4-build-multilib.eclass |
| 17 |
+++ b/eclass/qt4-build-multilib.eclass |
| 18 |
@@ -182,6 +182,10 @@ qt4-build-multilib_src_prepare() { |
| 19 |
filter-flags -fgraphite-identity |
| 20 |
fi |
| 21 |
|
| 22 |
+ # Read also AR from the environment |
| 23 |
+ sed -i -e 's/^SYSTEM_VARIABLES="/&AR /' \ |
| 24 |
+ configure || die "sed SYSTEM_VARIABLES failed" |
| 25 |
+ |
| 26 |
# Reset QMAKE_*FLAGS_{RELEASE,DEBUG} variables, |
| 27 |
# or they will override user's flags (.qmake.cache) |
| 28 |
sed -i -e '/^SYSTEM_VARIABLES=/ i \ |
| 29 |
@@ -191,7 +195,7 @@ qt4-build-multilib_src_prepare() { |
| 30 |
QMakeVar set QMAKE_CXXFLAGS_DEBUG\ |
| 31 |
QMakeVar set QMAKE_LFLAGS_RELEASE\ |
| 32 |
QMakeVar set QMAKE_LFLAGS_DEBUG\n' \ |
| 33 |
- configure || die "sed SYSTEM_VARIABLES failed" |
| 34 |
+ configure || die "sed QMAKE_*FLAGS_{RELEASE,DEBUG} failed" |
| 35 |
|
| 36 |
# Respect CC, CXX, LINK and *FLAGS in config.tests |
| 37 |
find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \ |
| 38 |
@@ -281,7 +285,8 @@ qt4-build-multilib_src_prepare() { |
| 39 |
# Runs configure and generates Makefiles for all QT4_TARGET_DIRECTORIES. |
| 40 |
qt4-build-multilib_src_configure() { |
| 41 |
# toolchain setup |
| 42 |
- tc-export CC CXX |
| 43 |
+ tc-export CC CXX OBJCOPY STRIP |
| 44 |
+ export AR="$(tc-getAR) cqs" |
| 45 |
export LD="$(tc-getCXX)" |
| 46 |
|
| 47 |
# configure arguments |
Archives