diff options
| author | Holger Freyther <zecke@selfish.org> | 2007-05-24 17:37:46 +0000 |
|---|---|---|
| committer | Holger Freyther <zecke@selfish.org> | 2007-05-24 17:37:46 +0000 |
| commit | a8c47c130cc6f87bd62bede1d276090dbf909f48 (patch) | |
| tree | c0d99e412acbca9d3c3b9ab06180f6f234fe45e6 | |
| parent | 1c6e2c60fd35e5272298c62fb9e9fa5c13aa9806 (diff) | |
| parent | c2d4f57002933523cebd64df07e3a4384ca6c655 (diff) | |
merge of '51a33385cc433c55cd19bd8dc3705adb1e86f59a'
and '7efadd625919e78e49dfd108fff87b192f63f3fa'
| -rw-r--r-- | conf/checksums.ini | 6 | ||||
| -rw-r--r-- | packages/libiconv/libiconv_1.11.bb (renamed from packages/libiconv/libiconv_1.9.2.bb) | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 953b5a14ea..dba0f2839d 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -854,9 +854,9 @@ sha256=2d7af8211cda81abde3e0bb8ccedbd18924a27b244ff35d4eacafcf899038c56 md5=183f6d46e8fa5e4b2aff240ab1586c2e sha256=80c38a005325e7539012bd665fb8e06af9ee9bfc74efb236ebff121265bfd463 -[ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.9.2.tar.gz] -md5=6bc300365053c815b10b800a21e0bc7e -sha256=fdb726c5d3761d4c1569e702b74cf9561dc07c6a5f48af3e3fd18685f50d490c +[ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.11.tar.gz] +md5=b77a17e4a5a817100ad4b2613935055e +sha256=fbf5b9a63ea6e3abebfabc04506f0e18a2860071031e34ea4ad4f450b8c43d4b [ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-0.6.7.tar.gz] md5=db4e6939fafbaae80cab11a67f28771d 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 () { |