summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorHolger Freyther <zecke@selfish.org>2007-05-24 17:37:46 +0000
committerHolger Freyther <zecke@selfish.org>2007-05-24 17:37:46 +0000
commita8c47c130cc6f87bd62bede1d276090dbf909f48 (patch)
treec0d99e412acbca9d3c3b9ab06180f6f234fe45e6 /packages
parent1c6e2c60fd35e5272298c62fb9e9fa5c13aa9806 (diff)
parentc2d4f57002933523cebd64df07e3a4384ca6c655 (diff)
merge of '51a33385cc433c55cd19bd8dc3705adb1e86f59a'
and '7efadd625919e78e49dfd108fff87b192f63f3fa'
Diffstat (limited to 'packages')
-rw-r--r--packages/libiconv/libiconv_1.11.bb (renamed from packages/libiconv/libiconv_1.9.2.bb)9
1 files changed, 8 insertions, 1 deletions
diff --git a/packages/libiconv/libiconv_1.9.2.bb b/packages/libiconv/libiconv_1.11.bb
index 059d5fd4c5..de87486a87 100644
--- a/packages/libiconv/libiconv_1.9.2.bb
+++ b/packages/libiconv/libiconv_1.11.bb
@@ -13,11 +13,18 @@ S = "${WORKDIR}/libiconv-${PV}"
inherit autotools pkgconfig
-EXTRA_OECONF += "--enable-shared --enable-static"
+EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable"
do_configure () {
rm -f m4/libtool.m4 libcharset/m4/libtool.m4
autotools_do_configure
+
+ # As we do not really regenerate the Makefiles... and they have stale deps to this file
+ touch m4/libtool.m4
+
+ # Fix stupid libtool... handling. rpath handling can't be disabled and the Makefile's can't be regenerated..
+ # (GNU sed required)
+ sed -i s/^hardcode_libdir_flag_spec/#hardcode_libdir_flag_spec/ ${S}/*-libtool
}
do_stage () {