diff options
| author | Holger Freyther <zecke@selfish.org> | 2007-05-24 17:34:13 +0000 |
|---|---|---|
| committer | Holger Freyther <zecke@selfish.org> | 2007-05-24 17:34:13 +0000 |
| commit | c2d4f57002933523cebd64df07e3a4384ca6c655 (patch) | |
| tree | 398f2905b26f7842c79845f2e8662e43c843cf9e /packages/libiconv | |
| parent | b14817b1d05d06f5deb04c8bc79e359c874deb62 (diff) | |
packages/libiconv: Battle libiconv to not use a rpath (and fix the uclibc build)
-Update libiconv to 1.11 (the latest)
-We do not package the LD_PRELOADable libiconv stub
-Try hard to disable the rpath issue and.
--disable-rpath doesn't disable the roath
--disable-rpath=no (wasn't tested and if it works....)
--enable-relocatable says to imply --disable-rpath but that doesn't work.
Also the files can't be regenerated as the Makefile.am doesn't exist and
people patch the Makefile.in.
As a last resort fail back to some GNU sed to patch *-libtool to make sure that
hardcoding of rpaths will fail!
Diffstat (limited to 'packages/libiconv')
| -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 () { |