Merges.

2004/11/16 14:30:47-06:00 handhelds.org!kergoth
Unbork a few of the glibc PROVIDES bits, and inherit the gettext oeclass.

2004/11/16 14:30:06-06:00 handhelds.org!kergoth
Add netkit-rpc and netkit-rpc-native 0.17.

BKrev: 419a63a1R_hDeZjulhRoww86zmmPhg

5 files changed, 10 insertions, 10 deletions

diff --git a/glibc/glibc_2.2.5.oe b/glibc/glibc_2.2.5.oe
index bee9fe98a1..628f472754 100644
--- a/glibc/glibc_2.2.5.oe
+++ b/glibc/glibc_2.2.5.oe
@@ -29,7 +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"
+PROVIDES += "${@['virtual/libiconv virtual/libintl', ''][oe.data.getVar('USE_NLS', d, 1) == 'no']}"
 DEPENDS = "patcher-native ${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers"
 INHIBIT_DEFAULT_DEPS = "1"
 
@@ -114,7 +114,7 @@ SRC_URI = "${GNU_MIRROR}/glibc/glibc-${PV}.tar.gz \
 S = "${WORKDIR}/glibc-${PV}"
 B = "${WORKDIR}/build-${TARGET_SYS}"
 
-inherit autotools
+inherit autotools gettext
 
 EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
 	        --without-cvs --disable-profile --disable-debug --without-gd \
diff --git a/glibc/glibc_2.3.2+cvs20040726.oe b/glibc/glibc_2.3.2+cvs20040726.oe
index 5f70050695..c50b4e3fb1 100644
--- a/glibc/glibc_2.3.2+cvs20040726.oe
+++ b/glibc/glibc_2.3.2+cvs20040726.oe
@@ -31,7 +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"
+PROVIDES += "${@['virtual/libiconv virtual/libintl', ''][oe.data.getVar('USE_NLS', d, 1) == 'no']}"
 DEPENDS = "patcher-native ${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers"
 INHIBIT_DEFAULT_DEPS = "1"
 
@@ -75,7 +75,7 @@ SRC_URI_append_ramses = " file://ldsocache-varrun.patch;patch=1"
 S = "${WORKDIR}/libc"
 B = "${WORKDIR}/build-${TARGET_SYS}"
 
-inherit autotools
+inherit autotools gettext
 
 EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
 	        --without-cvs --disable-profile --disable-debug --without-gd \
diff --git a/glibc/glibc_2.3.2.oe b/glibc/glibc_2.3.2.oe
index 17277a056c..0333acc830 100644
--- a/glibc/glibc_2.3.2.oe
+++ b/glibc/glibc_2.3.2.oe
@@ -25,10 +25,10 @@ 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}']}"
+PROVIDES += "${@['virtual/libiconv virtual/libintl', ''][oe.data.getVar('USE_NLS', d, 1) == 'no']}"
 DEPENDS = "patcher-native ${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers"
 INHIBIT_DEFAULT_DEPS = "1"
 
@@ -115,7 +115,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/glibc/glibc-${PV}.tar.gz \
 S = "${WORKDIR}/glibc-${PV}"
 B = "${WORKDIR}/build-${TARGET_SYS}"
 
-inherit autotools
+inherit autotools gettext
 
 EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
 	        --without-cvs --disable-profile --disable-debug --without-gd \
diff --git a/glibc/glibc_2.3.3.oe b/glibc/glibc_2.3.3.oe
index c6c12c8971..caec7d1ddd 100644
--- a/glibc/glibc_2.3.3.oe
+++ b/glibc/glibc_2.3.3.oe
@@ -31,7 +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"
+PROVIDES += "${@['virtual/libiconv virtual/libintl', ''][oe.data.getVar('USE_NLS', d, 1) == 'no']}"
 DEPENDS = "patcher-native ${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers"
 INHIBIT_DEFAULT_DEPS = "1"
 
@@ -60,7 +60,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/glibc/glibc-${PV}.tar.gz \
 S = "${WORKDIR}/glibc-${PV}"
 B = "${WORKDIR}/build-${TARGET_SYS}"
 
-inherit autotools
+inherit autotools gettext
 
 EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
 	        --without-cvs --disable-profile --disable-debug --without-gd \
diff --git a/glibc/glibc_cvs.oe b/glibc/glibc_cvs.oe
index d5c2544431..2dd2707457 100644
--- a/glibc/glibc_cvs.oe
+++ b/glibc/glibc_cvs.oe
@@ -32,7 +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"
+PROVIDES += "${@['virtual/libiconv virtual/libintl', ''][oe.data.getVar('USE_NLS', d, 1) == 'no']}"
 DEPENDS = "patcher-native ${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers"
 INHIBIT_DEFAULT_DEPS = "1"
 
@@ -76,7 +76,7 @@ SRC_URI_append_arm = " file://dyn-ldconfig.patch;patch=1;pnum=0"
 S = "${WORKDIR}/libc"
 B = "${WORKDIR}/build-${TARGET_SYS}"
 
-inherit autotools
+inherit autotools gettext
 
 EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
 	        --without-cvs --disable-profile --disable-debug --without-gd \