summaryrefslogtreecommitdiffstats
path: root/package/libs/gettext-full/patches/005-uclibc-0.9.30-compat.patch
diff options
context:
space:
mode:
authorRoman Yeryomin <roman@advem.lv>2013-05-26 01:02:55 +0300
committerRoman Yeryomin <roman@advem.lv>2013-05-26 01:02:55 +0300
commit342045a35b1981a89e4bc80842b10c065e1050da (patch)
tree4140720b20e8d641c11da882010d6130a75fef21 /package/libs/gettext-full/patches/005-uclibc-0.9.30-compat.patch
parent7338133dde8238afce34676214b494c8db96689b (diff)
parent1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff)
Merge trunk into realtek-unstable
Conflicts: Config.in feeds.conf.default package/base-files/files/etc/hotplug2-common.rules package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'package/libs/gettext-full/patches/005-uclibc-0.9.30-compat.patch')
-rw-r--r--package/libs/gettext-full/patches/005-uclibc-0.9.30-compat.patch22
1 files changed, 0 insertions, 22 deletions
diff --git a/package/libs/gettext-full/patches/005-uclibc-0.9.30-compat.patch b/package/libs/gettext-full/patches/005-uclibc-0.9.30-compat.patch
deleted file mode 100644
index dafa79c46..000000000
--- a/package/libs/gettext-full/patches/005-uclibc-0.9.30-compat.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/gettext-runtime/intl/localename.c
-+++ b/gettext-runtime/intl/localename.c
-@@ -2607,7 +2607,7 @@ gl_locale_name_thread_unsafe (int catego
- locale_t thread_locale = uselocale (NULL);
- if (thread_locale != LC_GLOBAL_LOCALE)
- {
--# if __GLIBC__ >= 2
-+# if __GLIBC__ >= 2 && !defined __UCLIBC__
- /* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
- glibc < 2.12.
- See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>. */
---- a/gettext-tools/gnulib-lib/localename.c
-+++ b/gettext-tools/gnulib-lib/localename.c
-@@ -2607,7 +2607,7 @@ gl_locale_name_thread_unsafe (int catego
- locale_t thread_locale = uselocale (NULL);
- if (thread_locale != LC_GLOBAL_LOCALE)
- {
--# if __GLIBC__ >= 2
-+# if __GLIBC__ >= 2 && !defined __UCLIBC__
- /* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
- glibc < 2.12.
- See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>. */