| 1 |
commit: fd4931f7892c72794633e85bd0e212f43111bded |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 4 00:14:01 2014 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 4 00:14:01 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fd4931f7 |
| 7 |
|
| 8 |
[qt4-build-multilib.eclass] Remove dead code. |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/qt4-build-multilib.eclass | 38 +++++++++++++------------------------- |
| 12 |
1 file changed, 13 insertions(+), 25 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass |
| 15 |
index 42e1097..0e26497 100644 |
| 16 |
--- a/eclass/qt4-build-multilib.eclass |
| 17 |
+++ b/eclass/qt4-build-multilib.eclass |
| 18 |
@@ -119,9 +119,11 @@ qt4-build-multilib_src_prepare() { |
| 19 |
fi |
| 20 |
|
| 21 |
if use_if_iuse aqua; then |
| 22 |
- sed -e '/^CONFIG/s:app_bundle::' \ |
| 23 |
+ sed -i \ |
| 24 |
+ -e '/^CONFIG/s:app_bundle::' \ |
| 25 |
-e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \ |
| 26 |
- -i mkspecs/$(qt4_get_mkspec)/qmake.conf || die |
| 27 |
+ mkspecs/$(qt4_get_mkspec)/qmake.conf \ |
| 28 |
+ || die "sed failed (aqua)" |
| 29 |
fi |
| 30 |
|
| 31 |
# Bug 261632 |
| 32 |
@@ -167,34 +169,19 @@ qt4-build-multilib_src_prepare() { |
| 33 |
sed -e 's:/X11R6/:/:' -i mkspecs/$(qt4_get_mkspec)/qmake.conf || die |
| 34 |
|
| 35 |
if [[ ${CHOST} == *-darwin* ]]; then |
| 36 |
- # Set FLAGS *and* remove -arch, since our gcc-apple is multilib |
| 37 |
- # crippled (by design) :/ |
| 38 |
- local mac_gpp_conf= |
| 39 |
- if [[ -f mkspecs/common/mac-g++.conf ]]; then |
| 40 |
- # qt < 4.8 has mac-g++.conf |
| 41 |
- mac_gpp_conf="mkspecs/common/mac-g++.conf" |
| 42 |
- elif [[ -f mkspecs/common/g++-macx.conf ]]; then |
| 43 |
- # qt >= 4.8 has g++-macx.conf |
| 44 |
- mac_gpp_conf="mkspecs/common/g++-macx.conf" |
| 45 |
- else |
| 46 |
- die "no known conf file for mac found" |
| 47 |
- fi |
| 48 |
- sed \ |
| 49 |
+ # Set FLAGS and remove -arch, since our gcc-apple is multilib crippled (by design) |
| 50 |
+ sed -i \ |
| 51 |
-e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ |
| 52 |
-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ |
| 53 |
-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=-headerpad_max_install_names ${LDFLAGS}:" \ |
| 54 |
-e "s:-arch\s\w*::g" \ |
| 55 |
- -i ${mac_gpp_conf} \ |
| 56 |
- || die "sed ${mac_gpp_conf} failed" |
| 57 |
+ mkspecs/common/g++-macx.conf \ |
| 58 |
+ || die "sed g++-macx.conf failed" |
| 59 |
|
| 60 |
# Fix configure's -arch settings that appear in qmake/Makefile and also |
| 61 |
# fix arch handling (automagically duplicates our -arch arg and breaks |
| 62 |
# pch). Additionally disable Xarch support. |
| 63 |
- local mac_gcc_confs="${mac_gpp_conf}" |
| 64 |
- if [[ -f mkspecs/common/gcc-base-macx.conf ]]; then |
| 65 |
- mac_gcc_confs+=" mkspecs/common/gcc-base-macx.conf" |
| 66 |
- fi |
| 67 |
- sed \ |
| 68 |
+ sed -i \ |
| 69 |
-e "s:-arch i386::" \ |
| 70 |
-e "s:-arch ppc::" \ |
| 71 |
-e "s:-arch x86_64::" \ |
| 72 |
@@ -204,14 +191,15 @@ qt4-build-multilib_src_prepare() { |
| 73 |
-e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \ |
| 74 |
-e "s:-Xarch_x86_64::g" \ |
| 75 |
-e "s:-Xarch_ppc64::g" \ |
| 76 |
- -i configure ${mac_gcc_confs} \ |
| 77 |
+ configure mkspecs/common/gcc-base-macx.conf mkspecs/common/g++-macx.conf \ |
| 78 |
|| die "sed -arch/-Xarch failed" |
| 79 |
|
| 80 |
# On Snow Leopard don't fall back to 10.5 deployment target. |
| 81 |
if [[ ${CHOST} == *-apple-darwin10 ]]; then |
| 82 |
- sed -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \ |
| 83 |
+ sed -i \ |
| 84 |
+ -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \ |
| 85 |
-e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \ |
| 86 |
- -i configure ${mac_gpp_conf} \ |
| 87 |
+ configure mkspecs/common/g++-macx.conf \ |
| 88 |
|| die "sed deployment target failed" |
| 89 |
fi |
| 90 |
fi |
Archives