diff options
| -rw-r--r-- | toolchain/uClibc/Config.in | 8 | ||||
| -rw-r--r-- | toolchain/uClibc/uClibc-0.9.28.1-time-locale.patch | 15 | ||||
| -rw-r--r-- | toolchain/uClibc/uclibc.mk | 7 |
3 files changed, 4 insertions, 26 deletions
diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in index 6d38fb7c0..25189fff5 100644 --- a/toolchain/uClibc/Config.in +++ b/toolchain/uClibc/Config.in @@ -13,12 +13,8 @@ choice depends BR2_DEPRECATED bool "uClibc 0.9.28" - config BR2_UCLIBC_VERSION_0_9_28_1 - depends BR2_DEPRECATED - bool "uClibc 0.9.28.1" - - config BR2_UCLIBC_VERSION_0_9_28_2 - bool "uClibc 0.9.28.2" + config BR2_UCLIBC_VERSION_0_9_28_3 + bool "uClibc 0.9.28.3" config BR2_UCLIBC_VERSION_SNAPSHOT bool "daily snapshot" diff --git a/toolchain/uClibc/uClibc-0.9.28.1-time-locale.patch b/toolchain/uClibc/uClibc-0.9.28.1-time-locale.patch deleted file mode 100644 index f449ad6a1..000000000 --- a/toolchain/uClibc/uClibc-0.9.28.1-time-locale.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: libc/misc/time/time.c -=================================================================== ---- a/libc/misc/time/time.c (revision 17534) -+++ b/libc/misc/time/time.c (revision 17647) -@@ -158,7 +158,9 @@ - #endif - - #if defined (L_tzset) || defined (L_localtime_r) || defined(L_strftime) || \ -- defined(L__time_mktime) || defined(L__time_mktime_tzi) -+ defined(L__time_mktime) || defined(L__time_mktime_tzi) || \ -+ ((defined(L_strftime) || defined(L_strftime_l)) && \ -+ defined(__UCLIBC_HAS_XLOCALE__)) - - void _time_tzset (int); - diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index 1e5b145bd..13da717e5 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -17,11 +17,8 @@ ifndef UCLIBC_CONFIG_FILE UCLIBC_CONFIG_FILE=toolchain/uClibc/uClibc-0.9.29.config endif else -ifeq ($(BR2_UCLIBC_VERSION_0_9_28_2),y) -UCLIBC_VER:=0.9.28.2 -endif -ifeq ($(BR2_UCLIBC_VERSION_0_9_28_1),y) -UCLIBC_VER:=0.9.28.1 +ifeq ($(BR2_UCLIBC_VERSION_0_9_28_3),y) +UCLIBC_VER:=0.9.28.3 endif ifeq ($(BR2_UCLIBC_VERSION_0_9_28),y) UCLIBC_VER:=0.9.28 |