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 | |
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>
-rw-r--r-- | meta/packages/gzip/gzip-1.3.12/dup-def-fix.patch | 45 | ||||
-rw-r--r-- | meta/packages/gzip/gzip-1.3.12/m4-extensions-fix.patch | 53 | ||||
-rw-r--r-- | meta/packages/gzip/gzip_1.3.12.bb | 39 |
3 files changed, 137 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]); | ||
diff --git a/meta/packages/gzip/gzip-1.3.12/m4-extensions-fix.patch b/meta/packages/gzip/gzip-1.3.12/m4-extensions-fix.patch new file mode 100644 index 0000000000..927377286f --- /dev/null +++ b/meta/packages/gzip/gzip-1.3.12/m4-extensions-fix.patch | |||
@@ -0,0 +1,53 @@ | |||
1 | remove AC_USE_SYSTEM_EXTENSIONS to fix the autoconf error "AC_REQUIRE: circular | ||
2 | dependency of AC_GNU_SOURCE" | ||
3 | |||
4 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | ||
5 | Index: 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, | ||
diff --git a/meta/packages/gzip/gzip_1.3.12.bb b/meta/packages/gzip/gzip_1.3.12.bb new file mode 100644 index 0000000000..c111e2e24d --- /dev/null +++ b/meta/packages/gzip/gzip_1.3.12.bb | |||
@@ -0,0 +1,39 @@ | |||
1 | DESCRIPTION = "Standard GNU compressor" | ||
2 | HOMEPAGE = "http://www.gnu.org/software/gzip" | ||
3 | SECTION = "base" | ||
4 | |||
5 | LICENSE = "GPLv2+" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ | ||
7 | file://gzip.h;endline=22;md5=c0934ad1900d927f86556153d4c76d23 \ | ||
8 | file://lzw.h;endline=19;md5=c273e09a02edd9801cc74d39683049e9 " | ||
9 | |||
10 | SRC_URI = "${GNU_MIRROR}/gzip/gzip-${PV}.tar.gz \ | ||
11 | file://m4-extensions-fix.patch;patch=1 \ | ||
12 | file://dup-def-fix.patch;patch=1" | ||
13 | |||
14 | PR = "r0" | ||
15 | |||
16 | inherit autotools | ||
17 | |||
18 | do_install () { | ||
19 | autotools_do_install | ||
20 | # move files into /bin (FHS) | ||
21 | install -d ${D}${base_bindir} | ||
22 | mv ${D}${bindir}/gunzip ${D}${base_bindir}/gunzip.${PN} | ||
23 | mv ${D}${bindir}/gzip ${D}${base_bindir}/gzip.${PN} | ||
24 | mv ${D}${bindir}/zcat ${D}${base_bindir}/zcat.${PN} | ||
25 | } | ||
26 | |||
27 | pkg_postinst_${PN} () { | ||
28 | update-alternatives --install ${base_bindir}/gunzip gunzip gunzip.${PN} 100 | ||
29 | update-alternatives --install ${base_bindir}/gzip gzip gzip.${PN} 100 | ||
30 | update-alternatives --install ${base_bindir}/zcat zcat zcat.${PN} 100 | ||
31 | } | ||
32 | |||
33 | pkg_prerm_${PN} () { | ||
34 | update-alternatives --remove gunzip gunzip.${PN} | ||
35 | update-alternatives --remove gzip gzip.${PN} | ||
36 | update-alternatives --remove zcat zcat.${PN} | ||
37 | } | ||
38 | |||
39 | BBCLASSEXTEND = "native" | ||