r4225 - in glibc-package/trunk/debian: . patches patches/hurd-i386
Author: sthibault
Date: 2010-03-16 00:06:01 +0000 (Tue, 16 Mar 2010)
New Revision: 4225
Added:
glibc-package/trunk/debian/patches/hurd-i386/local-locarchive.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
patches/hurd-i386/local-locarchive.diff: New patch to fix installation of locales-all.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2010-03-09 23:16:38 UTC (rev 4224)
+++ glibc-package/trunk/debian/changelog 2010-03-16 00:06:01 UTC (rev 4225)
@@ -6,6 +6,8 @@
* patches/any/submitted-remove.diff: New patch to fix remove() on
directory on non-Linux ports.
* patches/hurd-i386/cvs-setsid.diff: Update to git version.
+ * patches/hurd-i386/local-locarchive.diff: New patch to fix installation of
+ locales-all.
[ Aurelien Jarno ]
* debian/control.in/*: add ${misc:Depends} to all binary packages.
Added: glibc-package/trunk/debian/patches/hurd-i386/local-locarchive.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/local-locarchive.diff (rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/local-locarchive.diff 2010-03-16 00:06:01 UTC (rev 4225)
@@ -0,0 +1,28 @@
+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.
+
+---
+ locarchive.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c
+index 85ba77d..8a2352f 100644
+--- a/locale/programs/locarchive.c
++++ b/locale/programs/locarchive.c
+@@ -415,7 +415,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);
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2010-03-09 23:16:38 UTC (rev 4224)
+++ glibc-package/trunk/debian/patches/series 2010-03-16 00:06:01 UTC (rev 4225)
@@ -115,6 +115,7 @@
hurd-i386/cvs-getcwd.diff
hurd-i386/cvs-setsid.diff
hurd-i386/submitted-getnprocs.diff
+hurd-i386/local-locarchive.diff
ia64/submitted-sysconf.diff
ia64/submitted-libm.diff
Reply to: