| 1 |
commit: 7e71215c77b38814444820a54cf24fc7daa4ce92 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 29 21:39:01 2014 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 29 21:39:01 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7e71215c |
| 7 |
|
| 8 |
[qt4-build-multilib.eclass] Simplify how toolchain vars are respected. |
| 9 |
|
| 10 |
Backported from qt5-build.eclass |
| 11 |
|
| 12 |
--- |
| 13 |
eclass/qt4-build-multilib.eclass | 41 +++++++++++++++++----------------------- |
| 14 |
1 file changed, 17 insertions(+), 24 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass |
| 17 |
index e908604..af90b06 100644 |
| 18 |
--- a/eclass/qt4-build-multilib.eclass |
| 19 |
+++ b/eclass/qt4-build-multilib.eclass |
| 20 |
@@ -189,21 +189,16 @@ qt4-build-multilib_src_prepare() { |
| 21 |
filter-flags -fgraphite-identity |
| 22 |
fi |
| 23 |
|
| 24 |
- # Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache |
| 25 |
- sed -e "/^SYSTEM_VARIABLES=/i \ |
| 26 |
- CC='$(tc-getCC)'\n\ |
| 27 |
- CXX='$(tc-getCXX)'\n\ |
| 28 |
- CFLAGS='${CFLAGS}'\n\ |
| 29 |
- CXXFLAGS='${CXXFLAGS}'\n\ |
| 30 |
- LDFLAGS='${LDFLAGS}'\n\ |
| 31 |
- QMakeVar set QMAKE_CFLAGS_RELEASE\n\ |
| 32 |
- QMakeVar set QMAKE_CFLAGS_DEBUG\n\ |
| 33 |
- QMakeVar set QMAKE_CXXFLAGS_RELEASE\n\ |
| 34 |
- QMakeVar set QMAKE_CXXFLAGS_DEBUG\n\ |
| 35 |
- QMakeVar set QMAKE_LFLAGS_RELEASE\n\ |
| 36 |
- QMakeVar set QMAKE_LFLAGS_DEBUG\n"\ |
| 37 |
- -i configure \ |
| 38 |
- || die "sed SYSTEM_VARIABLES failed" |
| 39 |
+ # Reset QMAKE_*FLAGS_{RELEASE,DEBUG} variables, |
| 40 |
+ # or they will override user's flags (.qmake.cache) |
| 41 |
+ sed -i -e '/^SYSTEM_VARIABLES=/ i \ |
| 42 |
+ QMakeVar set QMAKE_CFLAGS_RELEASE\ |
| 43 |
+ QMakeVar set QMAKE_CFLAGS_DEBUG\ |
| 44 |
+ QMakeVar set QMAKE_CXXFLAGS_RELEASE\ |
| 45 |
+ QMakeVar set QMAKE_CXXFLAGS_DEBUG\ |
| 46 |
+ QMakeVar set QMAKE_LFLAGS_RELEASE\ |
| 47 |
+ QMakeVar set QMAKE_LFLAGS_DEBUG\n' \ |
| 48 |
+ configure || die "sed SYSTEM_VARIABLES failed" |
| 49 |
|
| 50 |
# Respect CC, CXX, LINK and *FLAGS in config.tests |
| 51 |
find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \ |
| 52 |
@@ -292,6 +287,10 @@ qt4-build-multilib_src_prepare() { |
| 53 |
# @DESCRIPTION: |
| 54 |
# Runs configure and generates Makefiles for all QT4_TARGET_DIRECTORIES. |
| 55 |
qt4-build-multilib_src_configure() { |
| 56 |
+ # toolchain setup |
| 57 |
+ tc-export CC CXX |
| 58 |
+ export LD="$(tc-getCXX)" |
| 59 |
+ |
| 60 |
# configure arguments |
| 61 |
local conf=" |
| 62 |
-prefix ${QT4_PREFIX} |
| 63 |
@@ -385,8 +384,8 @@ qt4-build-multilib_src_configure() { |
| 64 |
pushd ${dir} >/dev/null || die |
| 65 |
einfo "Running qmake in: ${dir}" |
| 66 |
"${S}"/bin/qmake \ |
| 67 |
- "LIBS+=-L${QT4_LIBDIR}" \ |
| 68 |
- "CONFIG+=nostrip" \ |
| 69 |
+ LIBS+=-L"${QT4_LIBDIR}" \ |
| 70 |
+ CONFIG+=nostrip \ |
| 71 |
|| die "qmake failed" |
| 72 |
popd >/dev/null || die |
| 73 |
done |
| 74 |
@@ -399,13 +398,7 @@ qt4-build-multilib_src_compile() { |
| 75 |
local dir |
| 76 |
for dir in ${QT4_TARGET_DIRECTORIES}; do |
| 77 |
pushd ${dir} >/dev/null || die |
| 78 |
- emake \ |
| 79 |
- AR="$(tc-getAR) cqs" \ |
| 80 |
- CC="$(tc-getCC)" \ |
| 81 |
- CXX="$(tc-getCXX)" \ |
| 82 |
- LINK="$(tc-getCXX)" \ |
| 83 |
- RANLIB=":" \ |
| 84 |
- STRIP=":" |
| 85 |
+ emake |
| 86 |
popd >/dev/null || die |
| 87 |
done |
| 88 |
} |
Archives