Merge openembedded@openembedded.bkbits.net:packages-devel

into handhelds.org:/home/kergoth/code/packages

2004/11/15 19:11:27-06:00 handhelds.org!kergoth
Add the necessary virtual/libintl and virtual/libiconv PROVIDES to the uclibc and glibc builds.

2004/11/15 19:10:29-06:00 handhelds.org!kergoth
Stage the target gettext build, and make it PROVIDES virtual/libintl.

2004/11/15 19:09:34-06:00 handhelds.org!kergoth
Unbork the libiconv builds a bit, and make the target libiconv PROVIDES virtual/libiconv.

2004/11/12 12:03:48-06:00 handhelds.org!kergoth
Merge openembedded@openembedded.bkbits.net:packages-devel
into handhelds.org:/home/kergoth/code/packages

2004/11/11 14:12:30-06:00 handhelds.org!kergoth
Merge openembedded@openembedded.bkbits.net:packages-devel
into handhelds.org:/home/kergoth/code/packages

2004/11/11 14:06:04-06:00 handhelds.org!kergoth
Enhance source distribution oeclass to support | seperated licenses (if any is distributable, that component is), and space seperated (all must be distributable).

BKrev: 419955354rVOOt21Zfjv5KsGqY457w

13 files changed, 60 insertions, 55 deletions

diff --git a/classes/src_distribute.oeclass b/classes/src_distribute.oeclass
index 72c4a722ed..8fe329c105 100644
--- a/classes/src_distribute.oeclass
+++ b/classes/src_distribute.oeclass
@@ -5,10 +5,28 @@ python do_distribute_sources () {
 	import copy
 	l = copy.deepcopy(d)
 	oe.data.update_data(l)
-	license = oe.data.getVar('LICENSE', d, 1)
+	licenses = (oe.data.getVar('LICENSE', d, 1) or "").split()
+	if not licenses:
+		oe.note("LICENSE not defined")
 	src_distribute_licenses = (oe.data.getVar('SRC_DISTRIBUTE_LICENSES', d, 1) or "").split()
-	if not oe.data.getVar('LICENSE', d, 1) in src_distribute_licenses:
-		oe.note("LICENSE not listed in SRC_DISTRIBUTE_LICENSES, skipping source distribution")
+	# Explanation:
+	# Space seperated items in LICENSE must *all* be distributable
+	# Each space seperated item may be used under any number of | seperated licenses.
+	# If any of those | seperated licenses are distributable, then that component is.
+	# i.e. LICENSE = "GPL LGPL"
+	#     In this case, both components are distributable.
+	# LICENSE = "GPL|QPL|Proprietary"
+	#     In this case, GPL is distributable, so the component is.
+	valid = 1
+	for l in licenses:
+		lvalid = 0
+		for i in l.split("|"):
+			if i in src_distribute_licenses:
+				lvalid = 1
+		if lvalid != 1:
+			valid = 0
+	if valid == 0:
+		oe.note("Licenses in LICENSE are not all listed in SRC_DISTRIBUTE_LICENSES, skipping source distribution")
 		return
 	import re
 	for s in (oe.data.getVar('A', d, 1) or "").split():
diff --git a/gettext/gettext-native_0.14.1.oe b/gettext/gettext-native_0.14.1.oe
index fce2df7c10..f25f431e48 100644
--- a/gettext/gettext-native_0.14.1.oe
+++ b/gettext/gettext-native_0.14.1.oe
@@ -2,6 +2,7 @@ include gettext_${PV}.oe
 S = "${WORKDIR}/gettext-${PV}"
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/gettext-${PV}"
 inherit native
+PROVIDES = ""
 
 M4 = "\
 lib-ld.m4 \
diff --git a/gettext/gettext_0.14.1.oe b/gettext/gettext_0.14.1.oe
index 7e42817670..481162ea91 100644
--- a/gettext/gettext_0.14.1.oe
+++ b/gettext/gettext_0.14.1.oe
@@ -1,7 +1,8 @@
 DESCRIPTION = "The GNU internationalization library."
 SECTION = "libs"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
+PROVIDES = "virtual/libintl"
 
 SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
 	   file://gettext-vpath.patch;patch=1;pnum=1 \
@@ -17,3 +18,12 @@ do_configure_prepend() {
 	rm -f ${S}/config/m4/libtool.m4
 	install -m 0644 ${STAGING_DATADIR}/aclocal/libtool.m4 ${S}/config/m4/
 }
+
+do_stage () {
+	autotools_stage_includes
+	oe_libinstall -so -C gettext-tools/lib libgettextlib ${STAGING_LIBDIR}/
+	oe_libinstall -so -C gettext-tools/src libgettextpo ${STAGING_LIBDIR}/
+	oe_libinstall -so -C gettext-tools/src libgettextsrc ${STAGING_LIBDIR}/
+	oe_libinstall -so -C gettext-tools/intl libintl ${STAGING_LIBDIR}/
+	oe_libinstall -so -C gettext-runtime/lib libasprintf ${STAGING_LIBDIR}/
+}
diff --git a/glibc/glibc_2.2.5.oe b/glibc/glibc_2.2.5.oe
index a868afaac9..bee9fe98a1 100644
--- a/glibc/glibc_2.2.5.oe
+++ b/glibc/glibc_2.2.5.oe
@@ -29,6 +29,7 @@ PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-d
 
 # nptl needs unwind support in gcc, which can't be built without glibc.
 PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}"
+PROVIDES += "virtual/libintl virtual/libiconv"
 DEPENDS = "patcher-native ${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers"
 INHIBIT_DEFAULT_DEPS = "1"
 
diff --git a/glibc/glibc_2.3.2+cvs20040726.oe b/glibc/glibc_2.3.2+cvs20040726.oe
index a476a74e95..a62f88add3 100644
--- a/glibc/glibc_2.3.2+cvs20040726.oe
+++ b/glibc/glibc_2.3.2+cvs20040726.oe
@@ -28,6 +28,7 @@ python __anonymous () {
 }
 
 PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile"
+PROVIDES += "virtual/libintl virtual/libiconv"
 
 # nptl needs unwind support in gcc, which can't be built without glibc.
 PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}"
diff --git a/glibc/glibc_2.3.2.oe b/glibc/glibc_2.3.2.oe
index 468b4423a1..17277a056c 100644
--- a/glibc/glibc_2.3.2.oe
+++ b/glibc/glibc_2.3.2.oe
@@ -25,6 +25,7 @@ python __anonymous () {
 }
 
 PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile"
+PROVIDES += "virtual/libintl virtual/libiconv"
 
 # nptl needs unwind support in gcc, which can't be built without glibc.
 PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}"
diff --git a/glibc/glibc_2.3.3.oe b/glibc/glibc_2.3.3.oe
index ef15076207..c6c12c8971 100644
--- a/glibc/glibc_2.3.3.oe
+++ b/glibc/glibc_2.3.3.oe
@@ -31,6 +31,7 @@ PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-d
 
 # nptl needs unwind support in gcc, which can't be built without glibc.
 PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}"
+PROVIDES += "virtual/libintl virtual/libiconv"
 DEPENDS = "patcher-native ${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers"
 INHIBIT_DEFAULT_DEPS = "1"
 
diff --git a/glibc/glibc_cvs.oe b/glibc/glibc_cvs.oe
index 54879e7943..d5c2544431 100644
--- a/glibc/glibc_cvs.oe
+++ b/glibc/glibc_cvs.oe
@@ -32,6 +32,7 @@ PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-d
 
 # nptl needs unwind support in gcc, which can't be built without glibc.
 PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}"
+PROVIDES += "virtual/libintl virtual/libiconv"
 DEPENDS = "patcher-native ${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers"
 INHIBIT_DEFAULT_DEPS = "1"
 
diff --git a/libiconv/libiconv-native_1.9.2.oe b/libiconv/libiconv-native_1.9.2.oe
index 4160afd416..8c1f4336d6 100644
--- a/libiconv/libiconv-native_1.9.2.oe
+++ b/libiconv/libiconv-native_1.9.2.oe
@@ -7,6 +7,7 @@ MAINTAINER = "That Crazy fool emte <emte@labotomy.net>"
 # FIXME: Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8
 DEPENDS = "gettext-native"
 PR = "r1"
+PROVIDES = ""
 
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-${PV}.tar.gz"
 
@@ -16,56 +17,11 @@ S = "${WORKDIR}/libiconv-${PV}"
 
 inherit autotools native
 
-do_configure_prepend () {
-}
-
 do_stage () {
-	oe_libinstall -so lib/libiconv_plug_linux ${STAGING_LIBDIR}
+	oe_libinstall -so -C lib libiconv ${STAGING_LIBDIR}
+	oe_libinstall -so -C lib libiconv_plug_linux ${STAGING_LIBDIR}
+	oe_libinstall -so -C libcharset/lib libcharset ${STAGING_LIBDIR}
 	autotools_stage_includes
-	install -d ${STAGING_INCDIR}/include
-	install -m 0755 ${S}/include/iconv.h ${STAGING_INCDIR}/iconv.h
-	install -d ${STAGING_DATADIR}/aclocal
-	install -m 0644 ${S}/m4/alloca.m4 ${STAGING_DATADIR}/aclocal/alloca.m4
-	install -m 0644 ${S}/m4/canonicalize.m4 ${STAGING_DATADIR}/aclocal/canonicalize.m4
-	install -m 0644 ${S}/m4/codeset.m4 ${STAGING_DATADIR}/aclocal/codeset.m4
-	install -m 0644 ${S}/m4/cp.m4 ${STAGING_DATADIR}/aclocal/cp.m4
-	install -m 0644 ${S}/m4/eilseq.m4 ${STAGING_DATADIR}/aclocal/eilseq.m4
-	install -m 0644 ${S}/m4/endian.m4 ${STAGING_DATADIR}/aclocal/endian.m4
-	install -m 0644 ${S}/m4/error.m4 ${STAGING_DATADIR}/aclocal/error.m4
-	install -m 0644 ${S}/m4/general.m4 ${STAGING_DATADIR}/aclocal/general.m4
-	install -m 0644 ${S}/m4/gettext.m4 ${STAGING_DATADIR}/aclocal/gettext.m4
-	install -m 0644 ${S}/m4/glibc21.m4 ${STAGING_DATADIR}/aclocal/glibc21.m4
-	install -m 0644 ${S}/m4/iconv.m4 ${STAGING_DATADIR}/aclocal/iconv.m4
-	install -m 0644 ${S}/m4/intmax.m4 ${STAGING_DATADIR}/aclocal/intmax.m4
-	install -m 0644 ${S}/m4/isc-posix.m4 ${STAGING_DATADIR}/aclocal/isc-posix.m4
-	install -m 0644 ${S}/m4/lcmessage.m4 ${STAGING_DATADIR}/aclocal/lcmessage.m4
-	install -m 0644 ${S}/m4/lib-ld.m4 ${STAGING_DATADIR}/aclocal/lib-ld.m4
-	install -m 0644 ${S}/m4/lib-link.m4 ${STAGING_DATADIR}/aclocal/lib-link.m4
-	install -m 0644 ${S}/m4/lib-prefix.m4 ${STAGING_DATADIR}/aclocal/lib-prefix.m4
-	install -m 0644 ${S}/m4/libtool.m4 ${STAGING_DATADIR}/aclocal/libtool.m4
-	install -m 0644 ${S}/m4/ln.m4 ${STAGING_DATADIR}/aclocal/ln.m4
-	install -m 0644 ${S}/m4/longdouble.m4 ${STAGING_DATADIR}/aclocal/longdouble.m4
-	install -m 0644 ${S}/m4/longlong.m4 ${STAGING_DATADIR}/aclocal/longlong.m4
-	install -m 0644 ${S}/m4/mbstate_t.m4 ${STAGING_DATADIR}/aclocal/mbstate_t.m4
-	install -m 0644 ${S}/m4/nls.m4 ${STAGING_DATADIR}/aclocal/nls.m4
-	install -m 0644 ${S}/m4/onceonly.m4 ${STAGING_DATADIR}/aclocal/onceonly.m4
-	install -m 0644 ${S}/m4/pathmax.m4 ${STAGING_DATADIR}/aclocal/pathmax.m4
-	install -m 0644 ${S}/m4/po.m4 ${STAGING_DATADIR}/aclocal/po.m4
-	install -m 0644 ${S}/m4/printf-posix.m4 ${STAGING_DATADIR}/aclocal/printf-posix.m4
-	install -m 0644 ${S}/m4/progtest.m4 ${STAGING_DATADIR}/aclocal/progtest.m4
-	install -m 0644 ${S}/m4/proto.m4 ${STAGING_DATADIR}/aclocal/proto.m4
-	install -m 0644 ${S}/m4/readlink.m4 ${STAGING_DATADIR}/aclocal/readlink.m4
-	install -m 0644 ${S}/m4/relocatable.m4 ${STAGING_DATADIR}/aclocal/relocatable.m4
-	install -m 0644 ${S}/m4/setenv.m4 ${STAGING_DATADIR}/aclocal/setenv.m4
-	install -m 0644 ${S}/m4/signed.m4 ${STAGING_DATADIR}/aclocal/signed.m4
-	install -m 0644 ${S}/m4/ssize_t.m4 ${STAGING_DATADIR}/aclocal/ssize_t.m4
-	install -m 0644 ${S}/m4/stdbool.m4 ${STAGING_DATADIR}/aclocal/stdbool.m4
-	install -m 0644 ${S}/m4/strerror.m4 ${STAGING_DATADIR}/aclocal/strerror.m4
-	install -m 0644 ${S}/m4/strerror_r.m4 ${STAGING_DATADIR}/aclocal/strerror_r.m4
-	install -m 0644 ${S}/m4/unlocked-io.m4 ${STAGING_DATADIR}/aclocal/unlocked-io.m4
-	install -m 0644 ${S}/m4/wchar_t.m4 ${STAGING_DATADIR}/aclocal/wchar_t.m4
-	install -m 0644 ${S}/m4/wint_t.m4 ${STAGING_DATADIR}/aclocal/wint_t.m4
-	install -m 0644 ${S}/m4/xreadlink.m4 ${STAGING_DATADIR}/aclocal/xreadlink.m4
 }
 
 do_install () {
diff --git a/libiconv/libiconv_1.9.2.oe b/libiconv/libiconv_1.9.2.oe
index 18f54b4620..0b8c85329b 100644
--- a/libiconv/libiconv_1.9.2.oe
+++ b/libiconv/libiconv_1.9.2.oe
@@ -3,10 +3,11 @@ multiple character encodings, but that support lacks from your system."
 HOMEPAGE = "http://www.gnu.org/software/libiconv"
 SECTION = "e/libs"
 PRIORITY = "optional"
-MAINTAINER = "That Crazy fool emte <emte@labotomy.net>
+MAINTAINER = "That Crazy fool emte <emte@labotomy.net>"
 NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8"
 DEPENDS = "libiconv-native"
-PR = "r1"
+PROVIDES = "virtual/libiconv"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-${PV}.tar.gz"
 
@@ -14,3 +15,14 @@ S = "${WORKDIR}/libiconv-${PV}"
 
 inherit autotools pkgconfig
 
+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 -C lib libiconv_plug_linux ${STAGING_LIBDIR}
+	oe_libinstall -so -C libcharset/lib libcharset ${STAGING_LIBDIR}
+	autotools_stage_includes
+}
diff --git a/uclibc/uclibc_0.9.21.oe b/uclibc/uclibc_0.9.21.oe
index 8586ebce93..41487e528f 100644
--- a/uclibc/uclibc_0.9.21.oe
+++ b/uclibc/uclibc_0.9.21.oe
@@ -8,6 +8,7 @@ FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/uclibc-${PV}"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc-initial"
 PROVIDES = "virtual/libc"
+PROVIDES += "virtual/libiconv"
 
 SRC_URI = "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2 \
            http://www.uclibc.org/downloads/toolchain/kernel-headers-2.4.21.tar.bz2"
diff --git a/uclibc/uclibc_0.9.26.oe b/uclibc/uclibc_0.9.26.oe
index 7365a87e80..2cc8c2cf8b 100644
--- a/uclibc/uclibc_0.9.26.oe
+++ b/uclibc/uclibc_0.9.26.oe
@@ -21,7 +21,8 @@ python __anonymous () {
                                    oe.data.getVar('TARGET_OS', d, 1))
 }
 
-PROVIDES += " virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
+PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
+PROVIDES += "virtual/libiconv"
 DEPENDS = "patcher-native virtual/${TARGET_PREFIX}binutils \
 	   virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
 INHIBIT_DEFAULT_DEPS = "1"
diff --git a/uclibc/uclibc_cvs.oe b/uclibc/uclibc_cvs.oe
index df6bfecfd9..3f76d9153d 100644
--- a/uclibc/uclibc_cvs.oe
+++ b/uclibc/uclibc_cvs.oe
@@ -24,6 +24,7 @@ python __anonymous () {
 }
 
 PROVIDES += " virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
+PROVIDES += "virtual/libiconv"
 DEPENDS = "patcher-native virtual/${TARGET_PREFIX}binutils \
 	   virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
 INHIBIT_DEFAULT_DEPS = "1"