Skip to content

Commit

Permalink
glibc_2_27: LOCAL_ARCHIVE -> LOCALE_ARCHIVE
Browse files Browse the repository at this point in the history
  • Loading branch information
shlevy committed Feb 28, 2018
1 parent f1dd205 commit edf0a76
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions pkgs/development/libraries/glibc/nix-locale-archive-2.27.patch
Expand Up @@ -9,8 +9,8 @@ diff -Naur glibc-2.27-orig/locale/loadarchive.c glibc-2.27/locale/loadarchive.c
+open_locale_archive (void)
+{
+ int fd = -1;
+ char *versioned_path = getenv ("LOCAL_ARCHIVE_2_27");
+ char *path = getenv ("LOCAL_ARCHIVE");
+ char *versioned_path = getenv ("LOCALE_ARCHIVE_2_27");
+ char *path = getenv ("LOCALE_ARCHIVE");
+ if (versioned_path)
+ fd = __open_nocancel (versioned_path, O_RDONLY|O_LARGEFILE|O_CLOEXEC);
+ if (path && fd < 0)
Expand Down Expand Up @@ -54,8 +54,8 @@ diff -Naur glibc-2.27-orig/locale/programs/locale.c glibc-2.27/locale/programs/l
+open_locale_archive (void)
+{
+ int fd = -1;
+ char *versioned_path = getenv ("LOCAL_ARCHIVE_2_27");
+ char *path = getenv ("LOCAL_ARCHIVE");
+ char *versioned_path = getenv ("LOCALE_ARCHIVE_2_27");
+ char *path = getenv ("LOCALE_ARCHIVE");
+ if (versioned_path)
+ fd = open64 (versioned_path, O_RDONLY);
+ if (path && fd < 0)
Expand Down Expand Up @@ -92,8 +92,8 @@ diff -Naur glibc-2.27-orig/locale/programs/locarchive.c glibc-2.27/locale/progra
+open_locale_archive (const char * archivefname, int flags)
+{
+ int fd = -1;
+ char *versioned_path = getenv ("LOCAL_ARCHIVE_2_27");
+ char *path = getenv ("LOCAL_ARCHIVE");
+ char *versioned_path = getenv ("LOCALE_ARCHIVE_2_27");
+ char *path = getenv ("LOCALE_ARCHIVE");
+ if (versioned_path)
+ fd = open64 (versioned_path, flags);
+ if (path && fd < 0)
Expand Down

0 comments on commit edf0a76

Please sign in to comment.