diff options
author | Zhai Edwin <edwin.zhai@intel.com> | 2010-08-16 14:31:15 +0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-19 13:09:50 +0100 |
commit | f626b8fc55218046e11a817c1251ca19121bb523 (patch) | |
tree | 84800b588fce0f8bd7b669c5721626686575f9bd /meta/packages/gzip/gzip-1.3.12/dup-def-fix.patch | |
parent | 6752cdfbf8fc44d6a981f56e296f0571e5fdd002 (diff) | |
download | poky-f626b8fc55218046e11a817c1251ca19121bb523.tar.gz |
gzip: Add 1.3.12(GPLv2) as new recipe
Remove AC_USE_SYSTEM_EXTENSIONS to fix autoconf error, and rename a function to
avoid duplicated defination between gblic and gunlib
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Diffstat (limited to 'meta/packages/gzip/gzip-1.3.12/dup-def-fix.patch')
-rw-r--r-- | meta/packages/gzip/gzip-1.3.12/dup-def-fix.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/meta/packages/gzip/gzip-1.3.12/dup-def-fix.patch b/meta/packages/gzip/gzip-1.3.12/dup-def-fix.patch new file mode 100644 index 0000000000..8308865a25 --- /dev/null +++ b/meta/packages/gzip/gzip-1.3.12/dup-def-fix.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | gzip uses gnulib, whose header conflict with glibc. This patch rename some function to avoid conflict. | ||
2 | |||
3 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | ||
4 | Index: gzip-1.3.12/gzip.c | ||
5 | =================================================================== | ||
6 | --- gzip-1.3.12.orig/gzip.c 2010-08-13 10:29:38.000000000 +0800 | ||
7 | +++ gzip-1.3.12/gzip.c 2010-08-13 10:29:44.000000000 +0800 | ||
8 | @@ -1637,7 +1637,7 @@ | ||
9 | } | ||
10 | } | ||
11 | |||
12 | - if (futimens (ofd, ofname, timespec) != 0) | ||
13 | + if (futimens_gnulib (ofd, ofname, timespec) != 0) | ||
14 | { | ||
15 | int e = errno; | ||
16 | WARN ((stderr, "%s: ", program_name)); | ||
17 | Index: gzip-1.3.12/lib/utimens.c | ||
18 | =================================================================== | ||
19 | --- gzip-1.3.12.orig/lib/utimens.c 2010-08-13 10:33:47.000000000 +0800 | ||
20 | +++ gzip-1.3.12/lib/utimens.c 2010-08-13 10:34:02.000000000 +0800 | ||
21 | @@ -75,7 +75,7 @@ | ||
22 | Return 0 on success, -1 (setting errno) on failure. */ | ||
23 | |||
24 | int | ||
25 | -futimens (int fd ATTRIBUTE_UNUSED, | ||
26 | +futimens_gnulib (int fd ATTRIBUTE_UNUSED, | ||
27 | char const *file, struct timespec const timespec[2]) | ||
28 | { | ||
29 | /* Some Linux-based NFS clients are buggy, and mishandle time stamps | ||
30 | @@ -185,5 +185,5 @@ | ||
31 | int | ||
32 | utimens (char const *file, struct timespec const timespec[2]) | ||
33 | { | ||
34 | - return futimens (-1, file, timespec); | ||
35 | + return futimens_gnulib (-1, file, timespec); | ||
36 | } | ||
37 | Index: gzip-1.3.12/lib/utimens.h | ||
38 | =================================================================== | ||
39 | --- gzip-1.3.12.orig/lib/utimens.h 2010-08-13 10:14:57.000000000 +0800 | ||
40 | +++ gzip-1.3.12/lib/utimens.h 2010-08-13 10:21:45.000000000 +0800 | ||
41 | @@ -1,3 +1,3 @@ | ||
42 | #include <time.h> | ||
43 | -int futimens (int, char const *, struct timespec const [2]); | ||
44 | +int futimens_gnulib (int, char const *, struct timespec const [2]); | ||
45 | int utimens (char const *, struct timespec const [2]); | ||