Merge branch 'master' into staging

Changed files
+6 -6
pkgs
development
+6 -6
pkgs/development/libraries/glibc/nix-locale-archive-2.27.patch
···
+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)
···
+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)
···
+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)