webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-14 13:02:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

coreutils: Fix compiling coreutils with glibc >= 2.10.

Browse Source
This commit is contained in:
Michael Tremer
2012-08-06 17:40:58 +02:00
parent ce346d23a4
commit d499764561
2 changed files with 57 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lfs/coreutils
View File

@@ -86,6 +86,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/coreutils-5.96-rename-tee.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/coreutils-5.96-futimes.patch
ifeq "$(ROOT)" ""
ifeq "$(MACHINE)" "i586"
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-uname-1.patch

56
src/patches/coreutils-5.96-futimes.patch Normal file
View File

@@ -0,0 +1,56 @@
--- coreutils-6.0.orig/lib/utimens.c 2006-06-11 09:14:31.000000000 +0200
+++ coreutils-6.0/lib/utimens.c 2007-07-17 00:41:08.000000000 +0200
@@ -75,7 +75,7 @@
Return 0 on success, -1 (setting errno) on failure. */
int
-futimens (int fd ATTRIBUTE_UNUSED,
+cu_futimens (int fd ATTRIBUTE_UNUSED,
char const *file, struct timespec const timespec[2])
{
/* There's currently no interface to set file timestamps with
@@ -168,5 +168,5 @@
int
utimens (char const *file, struct timespec const timespec[2])
{
- return futimens (-1, file, timespec);
+ return cu_futimens (-1, file, timespec);
}
--- coreutils-6.0.orig/lib/utimens.h 2004-11-23 21:41:51.000000000 +0100
+++ coreutils-6.0/lib/utimens.h 2007-07-17 00:41:31.000000000 +0200
@@ -1,3 +1,3 @@
#include "timespec.h"
-int futimens (int, char const *, struct timespec const [2]);
+int cu_futimens (int, char const *, struct timespec const [2]);
int utimens (char const *, struct timespec const [2]);
--- coreutils-6.0.orig/src/copy.c 2007-07-16 23:18:42.000000000 +0200
+++ coreutils-6.0/src/copy.c 2007-07-17 00:43:10.000000000 +0200
@@ -648,7 +648,7 @@
timespec[0] = get_stat_atime (src_sb);
timespec[1] = get_stat_mtime (src_sb);
- if (futimens (dest_desc, dst_name, timespec) != 0)
+ if (cu_futimens (dest_desc, dst_name, timespec) != 0)
{
error (0, errno, _("preserving times for %s"), quote (dst_name));
if (x->require_preserve)
--- coreutils-6.0.orig/src/touch.c 2005-11-02 11:01:07.000000000 +0100
+++ coreutils-6.0/src/touch.c 2007-07-17 00:43:51.000000000 +0200
@@ -167,7 +167,7 @@
if (amtime_now)
{
- /* Pass NULL to futimens so it will not fail if we have
+ /* Pass NULL to cu_futimens so it will not fail if we have
write access to the file, but don't own it. */
t = NULL;
}
@@ -182,7 +182,7 @@
t = timespec;
}
- ok = (futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0);
+ ok = (cu_futimens (fd, (fd == STDOUT_FILENO ? NULL : file), t) == 0);
if (fd == STDIN_FILENO)
{