diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-10-15 19:52:48 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-10-15 19:52:48 +0000 |
| commit | 977a74ae83e627094a4228984fbd181fffeae1df (patch) | |
| tree | bdf96049ae0562c4bad9610d7f90fc801aac536e /system/findutils/localename-test-fix.patch | |
| parent | dd60f61239bc94e9ebba77cd4729f0217859baa0 (diff) | |
| parent | ab4ea5a14d0ae6b6f20e308439f31ea4b42a8e55 (diff) | |
| download | packages-977a74ae83e627094a4228984fbd181fffeae1df.tar.gz packages-977a74ae83e627094a4228984fbd181fffeae1df.tar.bz2 packages-977a74ae83e627094a4228984fbd181fffeae1df.tar.xz packages-977a74ae83e627094a4228984fbd181fffeae1df.zip | |
Merge branch 'sr.2019.10.03' into 'master'
Miscellaneous bumps, 2019.10.03
See merge request adelie/packages!361
Diffstat (limited to 'system/findutils/localename-test-fix.patch')
| -rw-r--r-- | system/findutils/localename-test-fix.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/system/findutils/localename-test-fix.patch b/system/findutils/localename-test-fix.patch deleted file mode 100644 index 666261f03..000000000 --- a/system/findutils/localename-test-fix.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- findutils-4.6.0/tests/localename.c.old 2016-12-31 13:54:43.000000000 +0000 -+++ findutils-4.6.0/tests/localename.c 2017-07-30 16:40:47.098541270 +0000 -@@ -40,7 +40,7 @@ - # if defined __APPLE__ && defined __MACH__ - # include <xlocale.h> - # endif --# if __GLIBC__ >= 2 && !defined __UCLIBC__ -+# if defined __linux__ - # include <langinfo.h> - # endif - # if !defined IN_LIBINTL -@@ -2692,16 +2692,19 @@ - locale_t thread_locale = uselocale (NULL); - if (thread_locale != LC_GLOBAL_LOCALE) - { --# if __GLIBC__ >= 2 && !defined __UCLIBC__ -+# if defined(_NL_LOCALE_NAME) -+ const char *name = nl_langinfo(_NL_LOCALE_NAME(category)); -+# 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>. */ -- const char *name = -- nl_langinfo (_NL_ITEM ((category), _NL_ITEM_INDEX (-1))); -+ if (name[0] == '\0') -+ name = nl_langinfo (_NL_ITEM ((category), _NL_ITEM_INDEX (-1))); - if (name[0] == '\0') - /* Fallback code for glibc < 2.4, which did not implement - nl_langinfo (_NL_LOCALE_NAME (category)). */ - name = thread_locale->__names[category]; -+# endif - return name; - # elif defined __FreeBSD__ || (defined __APPLE__ && defined __MACH__) - /* FreeBSD, Mac OS X */ |