Merge nslu2-linux@nslu2-linux.bkbits.net:openembedded

into giantshoulder.com:/home/tom/dev/openslug/openembedded

2005/02/25 15:40:15-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/02/25 17:56:09-06:00 ti.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into odin.sc.ti.com:/home/kergoth/code/projects/oe/openembedded

2005/02/25 17:55:43-06:00 ti.com!kergoth
uclibc build: Fix libiconv to build its static lib and stage it -- for some reason popt requires a static version for something it builds.

BKrev: 421fec5elMKvK4rB-Y32j0iw-u3QDg

diff --git a/packages/libiconv/libiconv_1.9.2.bb b/packages/libiconv/libiconv_1.9.2.bb
index 0870f5a..16a595c 100644 (file)
--- a/packages/libiconv/libiconv_1.9.2.bb
+++ b/packages/libiconv/libiconv_1.9.2.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 MAINTAINER = "That Crazy fool emte <emte@labotomy.net>"
 NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8"
 PROVIDES = "virtual/libiconv"
-PR = "r2"
+PR = "r3"
 LICENSE = "LGPL"
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-${PV}.tar.gz"
 
@@ -14,14 +14,16 @@ 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 -C lib libiconv ${STAGING_LIBDIR}
+       oe_libinstall -so -a -C lib libiconv ${STAGING_LIBDIR}
        oe_libinstall -so -C lib libiconv_plug_linux ${STAGING_LIBDIR}
-       oe_libinstall -so -C libcharset/lib libcharset ${STAGING_LIBDIR}
+       oe_libinstall -so -a -C libcharset/lib libcharset ${STAGING_LIBDIR}
        autotools_stage_includes
 }