summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/gzip/gzip-1.3.12
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-09-01 19:09:11 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-09-01 19:09:57 +0100
commitd62ee7eaf2ba025c3f64b2d4e10dc7cec4637612 (patch)
treef36fe3008f36ff75cbdd31b630f8f13f1f205ebb /meta/recipes-extended/gzip/gzip-1.3.12
parentcaab7fc509bf27706ff3248689f6afd04225cfda (diff)
downloadpoky-d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612.tar.gz
packages: Separate out most of the remaining packages into recipes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-extended/gzip/gzip-1.3.12')
-rw-r--r--meta/recipes-extended/gzip/gzip-1.3.12/dup-def-fix.patch45
-rw-r--r--meta/recipes-extended/gzip/gzip-1.3.12/m4-extensions-fix.patch53
2 files changed, 98 insertions, 0 deletions
diff --git a/meta/recipes-extended/gzip/gzip-1.3.12/dup-def-fix.patch b/meta/recipes-extended/gzip/gzip-1.3.12/dup-def-fix.patch
new file mode 100644
index 0000000000..8308865a25
--- /dev/null
+++ b/meta/recipes-extended/gzip/gzip-1.3.12/dup-def-fix.patch
@@ -0,0 +1,45 @@
1gzip uses gnulib, whose header conflict with glibc. This patch rename some function to avoid conflict.
2
3Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
4Index: 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));
17Index: 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 }
37Index: 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]);
diff --git a/meta/recipes-extended/gzip/gzip-1.3.12/m4-extensions-fix.patch b/meta/recipes-extended/gzip/gzip-1.3.12/m4-extensions-fix.patch
new file mode 100644
index 0000000000..927377286f
--- /dev/null
+++ b/meta/recipes-extended/gzip/gzip-1.3.12/m4-extensions-fix.patch
@@ -0,0 +1,53 @@
1remove AC_USE_SYSTEM_EXTENSIONS to fix the autoconf error "AC_REQUIRE: circular
2dependency of AC_GNU_SOURCE"
3
4Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
5Index: gzip-1.3.12/m4/extensions.m4
6===================================================================
7--- gzip-1.3.12.orig/m4/extensions.m4 2010-08-16 14:18:16.000000000 +0800
8+++ gzip-1.3.12/m4/extensions.m4 2010-08-16 14:21:54.000000000 +0800
9@@ -12,44 +12,6 @@
10 # enough in this area it's likely we'll need to redefine
11 # AC_USE_SYSTEM_EXTENSIONS for quite some time.
12
13-# AC_USE_SYSTEM_EXTENSIONS
14-# ------------------------
15-# Enable extensions on systems that normally disable them,
16-# typically due to standards-conformance issues.
17-AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
18-[
19- AC_BEFORE([$0], [AC_COMPILE_IFELSE])
20- AC_BEFORE([$0], [AC_RUN_IFELSE])
21-
22- AC_REQUIRE([AC_GNU_SOURCE])
23- AC_REQUIRE([AC_AIX])
24- AC_REQUIRE([AC_MINIX])
25-
26- AH_VERBATIM([__EXTENSIONS__],
27-[/* Enable extensions on Solaris. */
28-#ifndef __EXTENSIONS__
29-# undef __EXTENSIONS__
30-#endif
31-#ifndef _POSIX_PTHREAD_SEMANTICS
32-# undef _POSIX_PTHREAD_SEMANTICS
33-#endif
34-#ifndef _TANDEM_SOURCE
35-# undef _TANDEM_SOURCE
36-#endif])
37- AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__],
38- [ac_cv_safe_to_define___extensions__],
39- [AC_COMPILE_IFELSE(
40- [AC_LANG_PROGRAM([
41-# define __EXTENSIONS__ 1
42- AC_INCLUDES_DEFAULT])],
43- [ac_cv_safe_to_define___extensions__=yes],
44- [ac_cv_safe_to_define___extensions__=no])])
45- test $ac_cv_safe_to_define___extensions__ = yes &&
46- AC_DEFINE([__EXTENSIONS__])
47- AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
48- AC_DEFINE([_TANDEM_SOURCE])
49-])
50-
51 # gl_USE_SYSTEM_EXTENSIONS
52 # ------------------------
53 # Enable extensions on systems that normally disable them,