diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/uclibc/uclibc.inc | 5 | ||||
| -rw-r--r-- | packages/uclibc/uclibc_0.9.30.bb | 3 | ||||
| -rw-r--r-- | packages/uclibc/uclibc_svn.bb | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc index 9b27e1f323..722a36ce18 100644 --- a/packages/uclibc/uclibc.inc +++ b/packages/uclibc/uclibc.inc @@ -93,7 +93,10 @@ configmangle = 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE="${KERNEL_SOURCE}",g; \ s,^SHARED_LIB_LOADER_PATH=.*,SHARED_LIB_LOADER_PATH="/lib",; \ s,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX="/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) == "yes"]}' + ${@["s,.*UCLIBC_HAS_LOCALE.*,# UCLIBC_HAS_LOCALE is not set,;", ""][bb.data.getVar("USE_NLS", d, 1) == "yes"]} \ + ${@["","s,.*LDSO_GNU_HASH_SUPPORT.*,# LDSO_GNU_HASH_SUPPORT is not set,;"][bb.data.getVar("TARGET_ARCH", d, 1) == "avr32"]} \ + ' + CFLAGS := "${@oe_filter_out('-I\S+', '${CFLAGS}', d)}" python () { diff --git a/packages/uclibc/uclibc_0.9.30.bb b/packages/uclibc/uclibc_0.9.30.bb index 29d83523c0..e3155f30fa 100644 --- a/packages/uclibc/uclibc_0.9.30.bb +++ b/packages/uclibc/uclibc_0.9.30.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.30" -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "1" require uclibc.inc @@ -20,7 +20,6 @@ SRC_URI += "file://uClibc.machine file://uClibc.distro \ " SRC_URI_append_arm = " file://ldso_hash.patch;patch=1 " SRC_URI_append_armeb = " file://ldso_hash.patch;patch=1 " -SRC_URI_append_avr32 = " file://ldso_hash.patch;patch=1 " #recent versions uclibc require real kernel headers PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb index de6116a608..080ca60c6d 100644 --- a/packages/uclibc/uclibc_svn.bb +++ b/packages/uclibc/uclibc_svn.bb @@ -36,6 +36,5 @@ SRC_URI += "svn://uclibc.org/trunk;module=uClibc \ " SRC_URI_append_arm = " file://ldso_hash.patch;patch=1 " SRC_URI_append_armeb = " file://ldso_hash.patch;patch=1 " -SRC_URI_append_avr32 = " file://ldso_hash_arm.patch;patch=1 " S = "${WORKDIR}/uClibc" |