From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Fri, 26 Jan 2018 22:35:29 +0000 (+0000)
Subject: Fix installation of locales-all
X-Git-Tag: archive/raspbian/2.26-6+rpi1^2~165
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=256a93901beaf17707472579443bcc5142ebea30;p=glibc.git

Fix installation of locales-all

Dirty hack to fix installation of locales-all: instead of just locking the
archive extension (which is not supported on hurd-i386), lock it all.


Gbp-Pq: Topic hurd-i386
Gbp-Pq: Name tg-locarchive.diff
---

diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c
index f67b7b8d9..8937f8c40 100644
--- a/locale/programs/locarchive.c
+++ b/locale/programs/locarchive.c
@@ -453,7 +453,16 @@ enlarge_archive (struct locarhandle *ah, const struct locarhead *head)
     }
 
   /* Lock the new file.  */
+#ifdef __GNU__
+  struct flock fl;
+  fl.l_whence = SEEK_SET;
+  fl.l_start = 0;
+  fl.l_len = 0;
+  fl.l_type = F_WRLCK;
+  if (fcntl(fd, F_SETLKW, &fl) != 0)
+#else
   if (lockf64 (fd, F_LOCK, total) != 0)
+#endif
     {
       int errval = errno;
       unlink (fname);
@@ -613,7 +622,16 @@ open_archive (struct locarhandle *ah, bool readonly)
 	error (EXIT_FAILURE, errno, _("cannot stat locale archive \"%s\""),
 	       archivefname);
 
+#ifdef __GNU__
+      struct flock fl;
+      fl.l_whence = SEEK_SET;
+      fl.l_start = 0;
+      fl.l_len = 0;
+      fl.l_type = F_WRLCK;
+      if (!readonly && fcntl(fd, F_SETLKW, &fl) == -1)
+#else
       if (!readonly && lockf64 (fd, F_LOCK, sizeof (struct locarhead)) == -1)
+#endif
 	{
 	  close (fd);