ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: glibc-bootstrap-system.patch: Update for glibc-2.25.

Browse source 
* gnu/packages/patches/glibc-bootstrap-system.patch: Revert a change
from glibc-2.25 which would require the bootstrap-glibc to require the
linux-kernel-headers.
This commit is contained in:
Efraim Flashner 2017-02-17 12:30:13 +02:00
parent b05fa64fcf
commit 8f8f250bdc
No known key found for this signature in database
GPG key ID: F4C1D3917EACEE93
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gnu/packages/patches/glibc-bootstrap-system.patch
View file

@ -3,6 +3,10 @@ and popen(3) need to be tweaked to use the right shell. For the bootstrap
glibc, we just use whatever `sh' can be found in $PATH. The final glibc
instead uses the hard-coded absolute file name of `bash'.
The second part that touches fcntl-linux.h reverts a change from glibc-2.25
which would require the statically compiled glibc used in bootstrapping to
depend on the linux kernel headers.
--- a/sysdeps/posix/system.c
+++ b/sysdeps/posix/system.c
@@ -134,7 +134,7 @@ do_system (const char *line)
@ -26,3 +30,23 @@ instead uses the hard-coded absolute file name of `bash'.
_IO__exit (127);
}
_IO_close (child_end);
--- a/sysdeps/unix/sysv/linux/bits/fcntl-linux.h
+++ b/sysdeps/unix/sysv/linux/bits/fcntl-linux.h
@@ -318,7 +318,15 @@ struct f_owner_ex
/* Flags for fallocate. */
+# define FALLOC_FL_KEEP_SIZE 1 /* Don't extend size of file
+ even if offset + len is
+ greater than file size. */
+# define FALLOC_FL_PUNCH_HOLE 2 /* Create a hole in the file. */
+# define FALLOC_FL_COLLAPSE_RANGE 8 /* Remove a range of a file
+ without leaving a
+ hole. */
+# define FALLOC_FL_ZERO_RANGE 16 /* Convert a range of a
+ file to zeros. */
-# include <linux/falloc.h>
/* File handle structure. */