libinconv: split up into .inc and version file

2 files changed, 37 insertions, 15 deletions

diff --git a/packages/libiconv/libiconv.inc b/packages/libiconv/libiconv.inc
new file mode 100644
index 0000000000..c8152104c3
--- /dev/null
+++ b/packages/libiconv/libiconv.inc
@@ -0,0 +1,27 @@
+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"
+LICENSE = "LGPL"
+
+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-${PV}.tar.gz \
+	   file://autotools.patch;patch=1 \
+	   file://preload.patch;patch=1"
+
+S = "${WORKDIR}/libiconv-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable --disable-rpath"
+
+do_configure_append () {
+	        # 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 () {
+	autotools_stage_all
+}
diff --git a/packages/libiconv/libiconv_1.12.bb b/packages/libiconv/libiconv_1.12.bb
index e33071c2ad..824224e448 100644
--- a/packages/libiconv/libiconv_1.12.bb
+++ b/packages/libiconv/libiconv_1.12.bb
@@ -1,3 +1,4 @@
+<<<<<<< HEAD:packages/libiconv/libiconv_1.12.bb
 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"
@@ -11,22 +12,16 @@ LICENSE = "LGPL"
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-${PV}.tar.gz \
 	   file://autotools.patch;patch=1 \
 	   file://preload.patch;patch=1"
+=======
+require libiconv.inc
+>>>>>>> libinconv: split up into .inc and version file:packages/libiconv/libiconv_1.12.bb
 
-S = "${WORKDIR}/libiconv-${PV}"
-
-inherit autotools
+PROVIDES = "virtual/libiconv"
+PR = "r1"
 
-EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable --disable-rpath"
+#gettext.class cant be inherit here so use this hack
+DEPENDS = "${@['','gettext-native'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
 
-do_configure_append () {
-	        # 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
-}
+EXTRA_OECONF +=  "${@['--disable-nls','--enable-nls'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
 
-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
-}
+LEAD_SONAME = "libiconv.so"