aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2015-04-12 18:17:32 +0200
committerDavide Pesavento <pesa@gentoo.org>2015-04-12 18:17:32 +0200
commit6a666f95d25eb75c651033f50c27dbc6da343b53 (patch)
tree426e13c57162b37811972e79bf8630b94df97d16
parent[qt4-build-multilib.eclass] Merge two seds into one and simplify it. (diff)
downloadqt-6a666f95d25eb75c651033f50c27dbc6da343b53.tar.gz
qt-6a666f95d25eb75c651033f50c27dbc6da343b53.tar.bz2
qt-6a666f95d25eb75c651033f50c27dbc6da343b53.zip
[qt4-build-multilib.eclass] Remove sed that does not apply anymore.
This expression doesn't match anything since at least Qt 4.7.0, so it is effectively dead code. Those platforms that still need such patching have been broken for years, and apparently nobody cares.
-rw-r--r--eclass/qt4-build-multilib.eclass8
1 files changed, 0 insertions, 8 deletions
diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index c7e21cd1..9a758e4b 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -258,14 +258,6 @@ qt4-build-multilib_src_prepare() {
fi
fi
- # This is needed for all systems with a separate -liconv, except
- # Darwin, for which the sources already cater for -liconv
- if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
- sed -i -e 's|mac:\(LIBS += -liconv\)|\1|g' \
- config.tests/unix/iconv/iconv.pro \
- || die "sed iconv.pro failed"
- fi
-
if [[ ${CHOST} == *-solaris* ]]; then
sed -i -e '/^QMAKE_LFLAGS_THREAD/a QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \
mkspecs/$(qt4_get_mkspec)/qmake.conf || die