[oe-commits] org.oe.dev packages/libiconv: Battle libiconv to not use a rpath (and fix the uclibc build)

[freyther commit]

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!

Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: 7efadd625919e78e49dfd108fff87b192f63f3fa
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7efadd625919e78e49dfd108fff87b192f63f3fa
Files:
1
packages/libiconv/libiconv_1.9.2.bb
packages/libiconv/libiconv_1.11.bb
conf/checksums.ini
Diffs:

#
# mt diff -rc8c229b1cd2d9d747091b4b3c007e412189ff5bf -r7efadd625919e78e49dfd108fff87b192f63f3fa
#
# 
# 
# rename "packages/libiconv/libiconv_1.9.2.bb"
#     to "packages/libiconv/libiconv_1.11.bb"
# 
# patch "conf/checksums.ini"
#  from [7baa470a5270fde2a46d8d08c5cfaf8a37088211]
#    to [aae44932a5dd71e85cff747399c2880a5bbe1e36]
# 
# patch "packages/libiconv/libiconv_1.11.bb"
#  from [3a4e69620e97ab8a62c1ebde21ffede74dd8e1dd]
#    to [52137a0e3a08f75fd220e0d2b2721e50100fba4c]
# 
============================================================
--- conf/checksums.ini	7baa470a5270fde2a46d8d08c5cfaf8a37088211
+++ conf/checksums.ini	aae44932a5dd71e85cff747399c2880a5bbe1e36
@@ -854,9 +854,9 @@ sha256=80c38a005325e7539012bd665fb8e06af
 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
============================================================
--- packages/libiconv/libiconv_1.9.2.bb	3a4e69620e97ab8a62c1ebde21ffede74dd8e1dd
+++ packages/libiconv/libiconv_1.11.bb	52137a0e3a08f75fd220e0d2b2721e50100fba4c
@@ -13,11 +13,18 @@ inherit autotools pkgconfig
 
 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 () {