diff options
Diffstat (limited to 'uclibc/uclibc_cvs.oe')
| -rw-r--r-- | uclibc/uclibc_cvs.oe | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/uclibc/uclibc_cvs.oe b/uclibc/uclibc_cvs.oe index 3f76d9153d..2e84583e70 100644 --- a/uclibc/uclibc_cvs.oe +++ b/uclibc/uclibc_cvs.oe @@ -24,7 +24,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" @@ -60,7 +60,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 = "cvs://anonymous:@uclibc.org/var/cvs;module=uClibc \ - ${UCLIBC_LOCALE_URI} \ + ${@['${UCLIBC_LOCALE_URI}', ''][oe.data.getVar('USE_NLS', d, 1) == 'no']} \ file://nokernelheadercheck.patch;patch=1 \ file://dyn-ldconfig.patch;patch=1 \ file://uClibc.config" @@ -76,7 +76,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 () { |