diff options
Diffstat (limited to 'meta/recipes-extended/gzip')
-rw-r--r-- | meta/recipes-extended/gzip/gzip-1.3.12/dup-def-fix.patch | 48 | ||||
-rw-r--r-- | meta/recipes-extended/gzip/gzip-1.3.12/m4-extensions-fix.patch | 56 | ||||
-rw-r--r-- | meta/recipes-extended/gzip/gzip-1.6/wrong-path-fix.patch | 31 | ||||
-rw-r--r-- | meta/recipes-extended/gzip/gzip.inc | 35 | ||||
-rw-r--r-- | meta/recipes-extended/gzip/gzip_1.3.12.bb | 40 | ||||
-rw-r--r-- | meta/recipes-extended/gzip/gzip_1.6.bb | 9 |
6 files changed, 219 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..d9e8d212bf --- /dev/null +++ b/meta/recipes-extended/gzip/gzip-1.3.12/dup-def-fix.patch | |||
@@ -0,0 +1,48 @@ | |||
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 | |||
5 | Upstream-Status: Inappropriate [licensing] | ||
6 | |||
7 | Index: gzip-1.3.12/gzip.c | ||
8 | =================================================================== | ||
9 | --- gzip-1.3.12.orig/gzip.c 2010-08-13 10:29:38.000000000 +0800 | ||
10 | +++ gzip-1.3.12/gzip.c 2010-08-13 10:29:44.000000000 +0800 | ||
11 | @@ -1637,7 +1637,7 @@ | ||
12 | } | ||
13 | } | ||
14 | |||
15 | - if (futimens (ofd, ofname, timespec) != 0) | ||
16 | + if (futimens_gnulib (ofd, ofname, timespec) != 0) | ||
17 | { | ||
18 | int e = errno; | ||
19 | WARN ((stderr, "%s: ", program_name)); | ||
20 | Index: gzip-1.3.12/lib/utimens.c | ||
21 | =================================================================== | ||
22 | --- gzip-1.3.12.orig/lib/utimens.c 2010-08-13 10:33:47.000000000 +0800 | ||
23 | +++ gzip-1.3.12/lib/utimens.c 2010-08-13 10:34:02.000000000 +0800 | ||
24 | @@ -75,7 +75,7 @@ | ||
25 | Return 0 on success, -1 (setting errno) on failure. */ | ||
26 | |||
27 | int | ||
28 | -futimens (int fd ATTRIBUTE_UNUSED, | ||
29 | +futimens_gnulib (int fd ATTRIBUTE_UNUSED, | ||
30 | char const *file, struct timespec const timespec[2]) | ||
31 | { | ||
32 | /* Some Linux-based NFS clients are buggy, and mishandle time stamps | ||
33 | @@ -185,5 +185,5 @@ | ||
34 | int | ||
35 | utimens (char const *file, struct timespec const timespec[2]) | ||
36 | { | ||
37 | - return futimens (-1, file, timespec); | ||
38 | + return futimens_gnulib (-1, file, timespec); | ||
39 | } | ||
40 | Index: gzip-1.3.12/lib/utimens.h | ||
41 | =================================================================== | ||
42 | --- gzip-1.3.12.orig/lib/utimens.h 2010-08-13 10:14:57.000000000 +0800 | ||
43 | +++ gzip-1.3.12/lib/utimens.h 2010-08-13 10:21:45.000000000 +0800 | ||
44 | @@ -1,3 +1,3 @@ | ||
45 | #include <time.h> | ||
46 | -int futimens (int, char const *, struct timespec const [2]); | ||
47 | +int futimens_gnulib (int, char const *, struct timespec const [2]); | ||
48 | 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..6b2f69870e --- /dev/null +++ b/meta/recipes-extended/gzip/gzip-1.3.12/m4-extensions-fix.patch | |||
@@ -0,0 +1,56 @@ | |||
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 | |||
6 | Upstream-Status: Inappropriate [licensing] | ||
7 | |||
8 | Index: gzip-1.3.12/m4/extensions.m4 | ||
9 | =================================================================== | ||
10 | --- gzip-1.3.12.orig/m4/extensions.m4 2010-08-16 14:18:16.000000000 +0800 | ||
11 | +++ gzip-1.3.12/m4/extensions.m4 2010-08-16 14:21:54.000000000 +0800 | ||
12 | @@ -12,44 +12,6 @@ | ||
13 | # enough in this area it's likely we'll need to redefine | ||
14 | # AC_USE_SYSTEM_EXTENSIONS for quite some time. | ||
15 | |||
16 | -# AC_USE_SYSTEM_EXTENSIONS | ||
17 | -# ------------------------ | ||
18 | -# Enable extensions on systems that normally disable them, | ||
19 | -# typically due to standards-conformance issues. | ||
20 | -AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], | ||
21 | -[ | ||
22 | - AC_BEFORE([$0], [AC_COMPILE_IFELSE]) | ||
23 | - AC_BEFORE([$0], [AC_RUN_IFELSE]) | ||
24 | - | ||
25 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
26 | - AC_REQUIRE([AC_AIX]) | ||
27 | - AC_REQUIRE([AC_MINIX]) | ||
28 | - | ||
29 | - AH_VERBATIM([__EXTENSIONS__], | ||
30 | -[/* Enable extensions on Solaris. */ | ||
31 | -#ifndef __EXTENSIONS__ | ||
32 | -# undef __EXTENSIONS__ | ||
33 | -#endif | ||
34 | -#ifndef _POSIX_PTHREAD_SEMANTICS | ||
35 | -# undef _POSIX_PTHREAD_SEMANTICS | ||
36 | -#endif | ||
37 | -#ifndef _TANDEM_SOURCE | ||
38 | -# undef _TANDEM_SOURCE | ||
39 | -#endif]) | ||
40 | - AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__], | ||
41 | - [ac_cv_safe_to_define___extensions__], | ||
42 | - [AC_COMPILE_IFELSE( | ||
43 | - [AC_LANG_PROGRAM([ | ||
44 | -# define __EXTENSIONS__ 1 | ||
45 | - AC_INCLUDES_DEFAULT])], | ||
46 | - [ac_cv_safe_to_define___extensions__=yes], | ||
47 | - [ac_cv_safe_to_define___extensions__=no])]) | ||
48 | - test $ac_cv_safe_to_define___extensions__ = yes && | ||
49 | - AC_DEFINE([__EXTENSIONS__]) | ||
50 | - AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) | ||
51 | - AC_DEFINE([_TANDEM_SOURCE]) | ||
52 | -]) | ||
53 | - | ||
54 | # gl_USE_SYSTEM_EXTENSIONS | ||
55 | # ------------------------ | ||
56 | # Enable extensions on systems that normally disable them, | ||
diff --git a/meta/recipes-extended/gzip/gzip-1.6/wrong-path-fix.patch b/meta/recipes-extended/gzip/gzip-1.6/wrong-path-fix.patch new file mode 100644 index 0000000000..d4325779ce --- /dev/null +++ b/meta/recipes-extended/gzip/gzip-1.6/wrong-path-fix.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | fix MakeMaker issues with using wrong SHELL/GREP | ||
2 | |||
3 | A set of substitution is being processed to all target scripts with sed by | ||
4 | replacing some key words with the detected values at configure time, this | ||
5 | is exactly not compliant with cross compling, and will cause missing path | ||
6 | errors at run time like: | ||
7 | "/usr/bin/zgrep: line 230: /usr/bin/grep: No such file or directory" | ||
8 | |||
9 | Fixed by removing unneeded substitution and using real runtime paths | ||
10 | instead. | ||
11 | |||
12 | Signed-off-by: Ming Liu <ming.liu@windriver.com> | ||
13 | |||
14 | Upstream-Status: Pending | ||
15 | |||
16 | Index: gzip-1.3.12/Makefile.am | ||
17 | =================================================================== | ||
18 | diff -urpN a/Makefile.am b/Makefile.am | ||
19 | --- a/Makefile.am 2013-11-30 10:06:09.402234871 +0800 | ||
20 | +++ b/Makefile.am 2013-11-30 10:13:42.952236025 +0800 | ||
21 | @@ -81,9 +81,8 @@ gzip.doc.gz: gzip.doc $(bin_PROGRAMS) | ||
22 | SUFFIXES = .in | ||
23 | .in: | ||
24 | $(AM_V_GEN)sed \ | ||
25 | - -e 's|/bin/sh|$(SHELL)|g' \ | ||
26 | -e 's|[@]bindir@|'\''$(bindir)'\''|g' \ | ||
27 | - -e 's|[@]GREP@|$(GREP)|g' \ | ||
28 | + -e 's|[@]GREP@|$(base_bindir)/grep|g' \ | ||
29 | -e 's|[@]VERSION@|$(VERSION)|g' \ | ||
30 | $(srcdir)/$@.in >$@-t \ | ||
31 | && chmod a+x $@-t \ | ||
diff --git a/meta/recipes-extended/gzip/gzip.inc b/meta/recipes-extended/gzip/gzip.inc new file mode 100644 index 0000000000..b90856e796 --- /dev/null +++ b/meta/recipes-extended/gzip/gzip.inc | |||
@@ -0,0 +1,35 @@ | |||
1 | SUMMARY = "Standard GNU compressor" | ||
2 | DESCRIPTION = "GNU Gzip is a popular data compression program originally written by Jean-loup Gailly for the GNU \ | ||
3 | project. Mark Adler wrote the decompression part" | ||
4 | HOMEPAGE = "http://www.gnu.org/software/gzip/" | ||
5 | SECTION = "console/utils" | ||
6 | # change to GPLv3+ in 2007/07. Previous GPLv2 version is 1.3.12 | ||
7 | LICENSE = "GPLv3+" | ||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ | ||
9 | file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e" | ||
10 | |||
11 | SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz" | ||
12 | SRC_URI_append_class-target = " file://wrong-path-fix.patch" | ||
13 | |||
14 | inherit autotools texinfo | ||
15 | |||
16 | EXTRA_OEMAKE_class-target = "GREP=${base_bindir}/grep" | ||
17 | |||
18 | do_install_append () { | ||
19 | # Rename and move files into /bin (FHS), which is typical place for gzip | ||
20 | install -d ${D}${base_bindir} | ||
21 | mv ${D}${bindir}/gunzip ${D}${base_bindir}/gunzip | ||
22 | mv ${D}${bindir}/gzip ${D}${base_bindir}/gzip | ||
23 | mv ${D}${bindir}/zcat ${D}${base_bindir}/zcat | ||
24 | mv ${D}${bindir}/uncompress ${D}${base_bindir}/uncompress | ||
25 | } | ||
26 | |||
27 | inherit update-alternatives | ||
28 | |||
29 | ALTERNATIVE_PRIORITY = "100" | ||
30 | ALTERNATIVE_${PN} = "gunzip gzip zcat" | ||
31 | ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip" | ||
32 | ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip" | ||
33 | ALTERNATIVE_LINK_NAME[zcat] = "${base_bindir}/zcat" | ||
34 | |||
35 | export CONFIG_SHELL="/bin/sh" | ||
diff --git a/meta/recipes-extended/gzip/gzip_1.3.12.bb b/meta/recipes-extended/gzip/gzip_1.3.12.bb new file mode 100644 index 0000000000..45a33ffdd1 --- /dev/null +++ b/meta/recipes-extended/gzip/gzip_1.3.12.bb | |||
@@ -0,0 +1,40 @@ | |||
1 | SUMMARY = "Standard GNU compressor" | ||
2 | DESCRIPTION = "GNU Gzip is a popular data compression program originally written by Jean-loup Gailly for the GNU \ | ||
3 | project. Mark Adler wrote the decompression part" | ||
4 | HOMEPAGE = "http://www.gnu.org/software/gzip" | ||
5 | SECTION = "base" | ||
6 | |||
7 | LICENSE = "GPLv2+" | ||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ | ||
9 | file://gzip.h;endline=22;md5=c0934ad1900d927f86556153d4c76d23 \ | ||
10 | file://lzw.h;endline=19;md5=c273e09a02edd9801cc74d39683049e9 " | ||
11 | |||
12 | SRC_URI = "${GNU_MIRROR}/gzip/gzip-${PV}.tar.gz \ | ||
13 | file://m4-extensions-fix.patch \ | ||
14 | file://dup-def-fix.patch" | ||
15 | |||
16 | SRC_URI[md5sum] = "b5bac2d21840ae077e0217bc5e4845b1" | ||
17 | SRC_URI[sha256sum] = "3f565be05f7f3d1aff117c030eb7c738300510b7d098cedea796ca8e4cd587af" | ||
18 | |||
19 | PR = "r2" | ||
20 | |||
21 | inherit autotools | ||
22 | |||
23 | do_install_append () { | ||
24 | # move files into /bin (FHS) | ||
25 | install -d ${D}${base_bindir} | ||
26 | mv ${D}${bindir}/gunzip ${D}${base_bindir}/gunzip | ||
27 | mv ${D}${bindir}/gzip ${D}${base_bindir}/gzip | ||
28 | mv ${D}${bindir}/zcat ${D}${base_bindir}/zcat | ||
29 | mv ${D}${bindir}/uncompress ${D}${base_bindir}/uncompress | ||
30 | } | ||
31 | |||
32 | inherit update-alternatives | ||
33 | |||
34 | ALTERNATIVE_${PN} = "gzip gunzip zcat" | ||
35 | ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip" | ||
36 | ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip" | ||
37 | ALTERNATIVE_LINK_NAME[zcat] = "${base_bindir}/zcat" | ||
38 | ALTERNATIVE_PRIORITY = "100" | ||
39 | |||
40 | BBCLASSEXTEND = "native" | ||
diff --git a/meta/recipes-extended/gzip/gzip_1.6.bb b/meta/recipes-extended/gzip/gzip_1.6.bb new file mode 100644 index 0000000000..9c728dff5a --- /dev/null +++ b/meta/recipes-extended/gzip/gzip_1.6.bb | |||
@@ -0,0 +1,9 @@ | |||
1 | require gzip.inc | ||
2 | |||
3 | PROVIDES_append_class-native = " gzip-replacement-native" | ||
4 | NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" | ||
5 | |||
6 | BBCLASSEXTEND = "native" | ||
7 | |||
8 | SRC_URI[md5sum] = "38603cb2843bf5681ff41aab3bcd6a20" | ||
9 | SRC_URI[sha256sum] = "97eb83b763d9e5ad35f351fe5517e6b71521d7aac7acf3e3cacdb6b1496d8f7e" | ||