diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-08-05 09:22:45 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-08-05 09:22:45 +0200 |
| commit | 4838289a130f7925851e6e8f8213d79142d5c7a1 (patch) | |
| tree | 97af1da0ebfc43c693e54279a0581448b0263fbc | |
| parent | 0468b5c132ce8b5e8bd0ae0e0b2414296059bd1c (diff) | |
| parent | 27c667c782d90c43fb6148134feb207307674019 (diff) | |
| download | buildroot-novena-4838289a130f7925851e6e8f8213d79142d5c7a1.tar.gz buildroot-novena-4838289a130f7925851e6e8f8213d79142d5c7a1.zip | |
Merge branch 'gzip-fix' of git://git.busybox.net/~tpetazzoni/git/buildroot
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | package/gzip/gzip-1.3.12-rename-futimens.patch | 48 | ||||
| -rw-r--r-- | package/gzip/gzip.mk | 1 |
3 files changed, 50 insertions, 0 deletions
@@ -84,6 +84,7 @@ #509: Bump sqlite package to 3.6.16 #523: pciutils broken with external toolchain #533: Update gamin to 0.1.10 to fix compilation + #537: Fix gzip build with recent glibc 2009.05, Released June 1st, 2009: diff --git a/package/gzip/gzip-1.3.12-rename-futimens.patch b/package/gzip/gzip-1.3.12-rename-futimens.patch new file mode 100644 index 000000000..8315d7ca2 --- /dev/null +++ b/package/gzip/gzip-1.3.12-rename-futimens.patch @@ -0,0 +1,48 @@ +--- + gzip.c | 2 +- + lib/utimens.c | 4 ++-- + lib/utimens.h | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +Index: gzip-1.3.12/gzip.c +=================================================================== +--- gzip-1.3.12.orig/gzip.c ++++ gzip-1.3.12/gzip.c +@@ -1637,7 +1637,7 @@ + } + } + +- if (futimens (ofd, ofname, timespec) != 0) ++ if (gz_futimens (ofd, ofname, timespec) != 0) + { + int e = errno; + WARN ((stderr, "%s: ", program_name)); +Index: gzip-1.3.12/lib/utimens.c +=================================================================== +--- gzip-1.3.12.orig/lib/utimens.c ++++ gzip-1.3.12/lib/utimens.c +@@ -75,7 +75,7 @@ + Return 0 on success, -1 (setting errno) on failure. */ + + int +-futimens (int fd ATTRIBUTE_UNUSED, ++gz_futimens (int fd ATTRIBUTE_UNUSED, + char const *file, struct timespec const timespec[2]) + { + /* Some Linux-based NFS clients are buggy, and mishandle time stamps +@@ -185,5 +185,5 @@ + int + utimens (char const *file, struct timespec const timespec[2]) + { +- return futimens (-1, file, timespec); ++ return gz_futimens (-1, file, timespec); + } +Index: gzip-1.3.12/lib/utimens.h +=================================================================== +--- gzip-1.3.12.orig/lib/utimens.h ++++ gzip-1.3.12/lib/utimens.h +@@ -1,3 +1,3 @@ + #include <time.h> +-int futimens (int, char const *, struct timespec const [2]); ++int gz_futimens (int, char const *, struct timespec const [2]); + int utimens (char const *, struct timespec const [2]); diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk index beffe9d2e..84031613f 100644 --- a/package/gzip/gzip.mk +++ b/package/gzip/gzip.mk @@ -18,6 +18,7 @@ gzip-source: $(DL_DIR)/$(GZIP_SOURCE) $(GZIP_DIR)/.unpacked: $(DL_DIR)/$(GZIP_SOURCE) $(GZIP_CAT) $(DL_DIR)/$(GZIP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(GZIP_DIR) package/gzip gzip\*.patch touch $(GZIP_DIR)/.unpacked $(GZIP_DIR)/.configured: $(GZIP_DIR)/.unpacked |