diff options
| author | Shea Levy <shea@shealevy.com> | 2018-02-28 14:09:22 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-02-28 14:09:22 -0500 |
| commit | edf0a762117c589eece24b5cbcef11f0ebcc9011 (patch) | |
| tree | 52dbc41b28fd3b5b4ccb6a297bca2e04d8f521db /pkgs/development/libraries/glibc | |
| parent | f1dd205c4e5ac28931ae8cdcde9d3c9a8ed2a0f5 (diff) | |
| download | nixpkgs-edf0a762117c589eece24b5cbcef11f0ebcc9011.tar nixpkgs-edf0a762117c589eece24b5cbcef11f0ebcc9011.tar.gz nixpkgs-edf0a762117c589eece24b5cbcef11f0ebcc9011.tar.bz2 nixpkgs-edf0a762117c589eece24b5cbcef11f0ebcc9011.tar.lz nixpkgs-edf0a762117c589eece24b5cbcef11f0ebcc9011.tar.xz nixpkgs-edf0a762117c589eece24b5cbcef11f0ebcc9011.tar.zst nixpkgs-edf0a762117c589eece24b5cbcef11f0ebcc9011.zip | |
glibc_2_27: LOCAL_ARCHIVE -> LOCALE_ARCHIVE
Diffstat (limited to 'pkgs/development/libraries/glibc')
| -rw-r--r-- | pkgs/development/libraries/glibc/nix-locale-archive-2.27.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/libraries/glibc/nix-locale-archive-2.27.patch b/pkgs/development/libraries/glibc/nix-locale-archive-2.27.patch index 1b3590db4fd..39312951fcf 100644 --- a/pkgs/development/libraries/glibc/nix-locale-archive-2.27.patch +++ b/pkgs/development/libraries/glibc/nix-locale-archive-2.27.patch @@ -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) @@ -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) @@ -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) |