diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-11-16 06:25:18 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-11-16 06:25:18 +0000 |
| commit | 3408b5daab3ac66ba49cdf593e7ebd28c57f392e (patch) | |
| tree | 9546ead81ceb30858ef69c03dd67a2d12f880bf8 /uclibc/uclibc_0.9.26.oe | |
| parent | 6db62db5c4e728547ddefe281ac9e3a9566f37a2 (diff) | |
Kill off uclibc 0.9.21, unless someone else wants to pick up maintainance, and made the uclibc builds obey USE_NLS.
BKrev: 41999d4eyD8ytRyYN1OfZPk4MjH1WA
Diffstat (limited to 'uclibc/uclibc_0.9.26.oe')
| -rw-r--r-- | uclibc/uclibc_0.9.26.oe | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/uclibc/uclibc_0.9.26.oe b/uclibc/uclibc_0.9.26.oe index 2cc8c2cf8b..d9f41ab3e6 100644 --- a/uclibc/uclibc_0.9.26.oe +++ b/uclibc/uclibc_0.9.26.oe @@ -22,7 +22,7 @@ python __anonymous () { } PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" -PROVIDES += "virtual/libiconv" +PROVIDES += "${@['virtual/libiconv', ''][oe.data.getVar('USE_NLS', d, 1) == 'no']}" DEPENDS = "patcher-native virtual/${TARGET_PREFIX}binutils \ virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers" INHIBIT_DEFAULT_DEPS = "1" @@ -56,7 +56,7 @@ UCLIBC_LOCALE_URI = "http://www.uclibc.org/downloads/${UCLIBC_LOCALE_FILE}" UCLIBC_LOCALE_URI_arm = "http://openembedded.org/dl/uclibc-locale/${UCLIBC_LOCALE_FILE}" SRC_URI = "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2 \ - ${UCLIBC_LOCALE_URI} \ + ${@['${UCLIBC_LOCALE_URI}', ''][oe.data.getVar('USE_NLS', d, 1) == 'no']} \ file://26headers.patch;patch=1 \ file://nokernelheadercheck.patch;patch=1 \ file://dyn-ldconfig.patch;patch=1 \ @@ -73,7 +73,8 @@ configmangle = 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE="${CROSS_DIR}/${TARGET_SYS}/in s,^RUNTIME_PREFIX=.*,RUNTIME_PREFIX="/",g; \ s,^DEVEL_PREFIX=.*,DEVEL_PREFIX="/${prefix}",g; \ s,^SHARED_LIB_LOADER_PATH=.*,SHARED_LIB_LOADER_PATH="/lib",; \ - s,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y\nUCLIBC_HAS_LOCALE=n,g;' + s,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g; \ + ${@["s,.*UCLIBC_HAS_LOCALE.*,# UCLIBC_HAS_LOCALE is not set,;", ""][oe.data.getVar("USE_NLS", d, 1) != "no"]}' CFLAGS := "${@oe_filter_out('-I\S+', '${CFLAGS}', d)}" python () { |