From c2d4f57002933523cebd64df07e3a4384ca6c655 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Thu, 24 May 2007 17:34:13 +0000 Subject: 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! --- conf/checksums.ini | 6 +++--- packages/libiconv/libiconv_1.11.bb | 35 +++++++++++++++++++++++++++++++++++ packages/libiconv/libiconv_1.9.2.bb | 28 ---------------------------- 3 files changed, 38 insertions(+), 31 deletions(-) create mode 100644 packages/libiconv/libiconv_1.11.bb delete mode 100644 packages/libiconv/libiconv_1.9.2.bb 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.11.bb b/packages/libiconv/libiconv_1.11.bb new file mode 100644 index 0000000000..de87486a87 --- /dev/null +++ b/packages/libiconv/libiconv_1.11.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "GNU libiconv - libiconv is for you if your application needs to support \ +multiple character encodings, but that support lacks from your system." +HOMEPAGE = "http://www.gnu.org/software/libiconv" +SECTION = "libs" +PRIORITY = "optional" +NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8" +PROVIDES = "virtual/libiconv" +PR = "r4" +LICENSE = "LGPL" +SRC_URI = "ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-${PV}.tar.gz" + +S = "${WORKDIR}/libiconv-${PV}" + +inherit autotools pkgconfig + +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 () { + oe_libinstall -so -a -C lib libiconv ${STAGING_LIBDIR} + oe_libinstall -so -C lib libiconv_plug_linux ${STAGING_LIBDIR} + oe_libinstall -so -a -C libcharset/lib libcharset ${STAGING_LIBDIR} + autotools_stage_includes +} diff --git a/packages/libiconv/libiconv_1.9.2.bb b/packages/libiconv/libiconv_1.9.2.bb deleted file mode 100644 index 059d5fd4c5..0000000000 --- a/packages/libiconv/libiconv_1.9.2.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "GNU libiconv - libiconv is for you if your application needs to support \ -multiple character encodings, but that support lacks from your system." -HOMEPAGE = "http://www.gnu.org/software/libiconv" -SECTION = "libs" -PRIORITY = "optional" -NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8" -PROVIDES = "virtual/libiconv" -PR = "r4" -LICENSE = "LGPL" -SRC_URI = "ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-${PV}.tar.gz" - -S = "${WORKDIR}/libiconv-${PV}" - -inherit autotools pkgconfig - -EXTRA_OECONF += "--enable-shared --enable-static" - -do_configure () { - rm -f m4/libtool.m4 libcharset/m4/libtool.m4 - autotools_do_configure -} - -do_stage () { - oe_libinstall -so -a -C lib libiconv ${STAGING_LIBDIR} - oe_libinstall -so -C lib libiconv_plug_linux ${STAGING_LIBDIR} - oe_libinstall -so -a -C libcharset/lib libcharset ${STAGING_LIBDIR} - autotools_stage_includes -} -- cgit v1.2.3