diff options
| author | Chris Larson <clarson@kergoth.com> | 2005-03-08 21:15:55 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2005-03-08 21:15:55 +0000 |
| commit | 5193a4fcc801783c31f2803323dac39600506acf (patch) | |
| tree | d5d16dd213832ec7ef68be1145f8c57bc034138f /packages | |
| parent | d3b658e1a133f736df6b8c516e22ad72cf872c64 (diff) | |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into handhelds.org:/home/kergoth/code/openembedded
2005/03/08 16:15:10-05:00 handhelds.org!kergoth
Change the uclibc builds to not default to enabling their iconv support. Now you'd have to explicitly set USE_NLS = yes or USE_NLS_uclibc = yes to enable it.
BKrev: 422e160bVhUEgRSr4BFCOA6j-uebUg
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/uclibc/uclibc.inc | 8 | ||||
| -rw-r--r-- | packages/uclibc/uclibc_0.9.26.bb | 2 | ||||
| -rw-r--r-- | packages/uclibc/uclibc_0.9.27.bb | 2 | ||||
| -rw-r--r-- | packages/uclibc/uclibc_cvs.bb | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc index 04b5492da3..b86ffb1b9b 100644 --- a/packages/uclibc/uclibc.inc +++ b/packages/uclibc/uclibc.inc @@ -21,7 +21,7 @@ python __anonymous () { } PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" -PROVIDES += "${@['virtual/libiconv', ''][bb.data.getVar('USE_NLS', d, 1) == 'no']}" +PROVIDES += "${@['virtual/libiconv', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']}" DEPENDS = "virtual/${TARGET_PREFIX}binutils \ virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers" INHIBIT_DEFAULT_DEPS = "1" @@ -56,7 +56,7 @@ UCLIBC_LOCALE_FILE_arm = "uClibc-locale-030818.arm.tgz" 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 = "${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) == 'no']} \ +SRC_URI = "${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} \ file://uClibc.config" UCLIBC_PREFIX = "${CROSS_DIR}/${TARGET_SYS}" @@ -69,7 +69,7 @@ configmangle = 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE="${CROSS_DIR}/${TARGET_SYS}/in 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,g; \ - ${@["s,.*UCLIBC_HAS_LOCALE.*,# UCLIBC_HAS_LOCALE is not set,;", ""][bb.data.getVar("USE_NLS", d, 1) != "no"]}' + ${@["s,.*UCLIBC_HAS_LOCALE.*,# UCLIBC_HAS_LOCALE is not set,;", ""][bb.data.getVar("USE_NLS", d, 1) == "yes"]}' CFLAGS := "${@oe_filter_out('-I\S+', '${CFLAGS}', d)}" python () { @@ -81,7 +81,7 @@ uclibcbuild_do_patch() { ln -sf ${STAGING_INCDIR}/linux ${S}/include/linux ln -sf ${STAGING_INCDIR}/asm ${S}/include/asm - ${@['cp %s/%s extra/locale' % (bb.data.getVar('DL_DIR', d, 1) or '', bb.data.getVar('UCLIBC_LOCALE_FILE', d, 1) or ''), ''][bb.data.getVar('USE_NLS', d, 1) == 'no']} + ${@['cp %s/%s extra/locale' % (bb.data.getVar('DL_DIR', d, 1) or '', bb.data.getVar('UCLIBC_LOCALE_FILE', d, 1) or ''), ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} } python do_patch () { diff --git a/packages/uclibc/uclibc_0.9.26.bb b/packages/uclibc/uclibc_0.9.26.bb index 57f89be868..7d9530cb5a 100644 --- a/packages/uclibc/uclibc_0.9.26.bb +++ b/packages/uclibc/uclibc_0.9.26.bb @@ -1,4 +1,4 @@ -PR = "r4" +PR = "r5" include uclibc.inc diff --git a/packages/uclibc/uclibc_0.9.27.bb b/packages/uclibc/uclibc_0.9.27.bb index 96b1d34594..2ada38634b 100644 --- a/packages/uclibc/uclibc_0.9.27.bb +++ b/packages/uclibc/uclibc_0.9.27.bb @@ -1,5 +1,5 @@ DEFAULT_PREFERENCE = "1" -PR = "r1" +PR = "r2" include uclibc.inc diff --git a/packages/uclibc/uclibc_cvs.bb b/packages/uclibc/uclibc_cvs.bb index c7adc07c4e..373ee95324 100644 --- a/packages/uclibc/uclibc_cvs.bb +++ b/packages/uclibc/uclibc_cvs.bb @@ -1,5 +1,5 @@ PV = "0.0cvs${CVSDATE}" -PR = "r8" +PR = "r9" include uclibc.inc |