diff options
Diffstat (limited to 'meta/recipes-extended/gzip')
-rw-r--r-- | meta/recipes-extended/gzip/files/run-ptest | 6 | ||||
-rw-r--r-- | meta/recipes-extended/gzip/gzip-1.12/wrong-path-fix.patch (renamed from meta/recipes-extended/gzip/gzip-1.8/wrong-path-fix.patch) | 27 | ||||
-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.inc | 9 | ||||
-rw-r--r-- | meta/recipes-extended/gzip/gzip_1.12.bb | 41 | ||||
-rw-r--r-- | meta/recipes-extended/gzip/gzip_1.3.12.bb | 15 | ||||
-rw-r--r-- | meta/recipes-extended/gzip/gzip_1.8.bb | 18 |
8 files changed, 68 insertions, 152 deletions
diff --git a/meta/recipes-extended/gzip/files/run-ptest b/meta/recipes-extended/gzip/files/run-ptest new file mode 100644 index 0000000000..cf7c64949a --- /dev/null +++ b/meta/recipes-extended/gzip/files/run-ptest @@ -0,0 +1,6 @@ +#!/bin/sh + +cd src/tests + +make check + diff --git a/meta/recipes-extended/gzip/gzip-1.8/wrong-path-fix.patch b/meta/recipes-extended/gzip/gzip-1.12/wrong-path-fix.patch index 4dc10002ed..7f9e249de8 100644 --- a/meta/recipes-extended/gzip/gzip-1.8/wrong-path-fix.patch +++ b/meta/recipes-extended/gzip/gzip-1.12/wrong-path-fix.patch @@ -13,17 +13,24 @@ Signed-off-by: Ming Liu <ming.liu@windriver.com> Upstream-Status: Pending -Index: gzip-1.8/Makefile.am -=================================================================== ---- gzip-1.8.orig/Makefile.am -+++ gzip-1.8/Makefile.am -@@ -81,8 +81,7 @@ gzip.doc.gz: gzip.doc $(bin_PROGRAMS) - SUFFIXES = .in +--- + Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 4f51b61..80a5ddf 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -93,8 +93,7 @@ SUFFIXES = .in .in: - $(AM_V_GEN)sed \ + $(AM_V_GEN)rm -f $@-t $@ \ + && sed \ - -e 's|/bin/sh|$(SHELL)|g' \ - -e 's|[@]GREP@|$(GREP)|g' \ + -e 's|[@]GREP@|$(base_bindir)/grep|g' \ - -e 's|[@]VERSION@|$(VERSION)|g' \ - $(srcdir)/$@.in >$@-t \ - && chmod a+x $@-t \ + -e "s|'gzip'|$(GZIP_TRANSFORMED)|g" \ + -e "s|'zdiff'|$(ZDIFF_TRANSFORMED)|g" \ + -e "s|'zgrep'|$(ZGREP_TRANSFORMED)|g" \ +-- +2.7.4 + 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 deleted file mode 100644 index d9e8d212bf..0000000000 --- a/meta/recipes-extended/gzip/gzip-1.3.12/dup-def-fix.patch +++ /dev/null @@ -1,48 +0,0 @@ -gzip uses gnulib, whose header conflict with glibc. This patch rename some function to avoid conflict. - -Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> - -Upstream-Status: Inappropriate [licensing] - -Index: gzip-1.3.12/gzip.c -=================================================================== ---- gzip-1.3.12.orig/gzip.c 2010-08-13 10:29:38.000000000 +0800 -+++ gzip-1.3.12/gzip.c 2010-08-13 10:29:44.000000000 +0800 -@@ -1637,7 +1637,7 @@ - } - } - -- if (futimens (ofd, ofname, timespec) != 0) -+ if (futimens_gnulib (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 2010-08-13 10:33:47.000000000 +0800 -+++ gzip-1.3.12/lib/utimens.c 2010-08-13 10:34:02.000000000 +0800 -@@ -75,7 +75,7 @@ - Return 0 on success, -1 (setting errno) on failure. */ - - int --futimens (int fd ATTRIBUTE_UNUSED, -+futimens_gnulib (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 futimens_gnulib (-1, file, timespec); - } -Index: gzip-1.3.12/lib/utimens.h -=================================================================== ---- gzip-1.3.12.orig/lib/utimens.h 2010-08-13 10:14:57.000000000 +0800 -+++ gzip-1.3.12/lib/utimens.h 2010-08-13 10:21:45.000000000 +0800 -@@ -1,3 +1,3 @@ - #include <time.h> --int futimens (int, char const *, struct timespec const [2]); -+int futimens_gnulib (int, char const *, struct timespec const [2]); - 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 deleted file mode 100644 index 6b2f69870e..0000000000 --- a/meta/recipes-extended/gzip/gzip-1.3.12/m4-extensions-fix.patch +++ /dev/null @@ -1,56 +0,0 @@ -remove AC_USE_SYSTEM_EXTENSIONS to fix the autoconf error "AC_REQUIRE: circular -dependency of AC_GNU_SOURCE" - -Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> - -Upstream-Status: Inappropriate [licensing] - -Index: gzip-1.3.12/m4/extensions.m4 -=================================================================== ---- gzip-1.3.12.orig/m4/extensions.m4 2010-08-16 14:18:16.000000000 +0800 -+++ gzip-1.3.12/m4/extensions.m4 2010-08-16 14:21:54.000000000 +0800 -@@ -12,44 +12,6 @@ - # enough in this area it's likely we'll need to redefine - # AC_USE_SYSTEM_EXTENSIONS for quite some time. - --# AC_USE_SYSTEM_EXTENSIONS --# ------------------------ --# Enable extensions on systems that normally disable them, --# typically due to standards-conformance issues. --AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], --[ -- AC_BEFORE([$0], [AC_COMPILE_IFELSE]) -- AC_BEFORE([$0], [AC_RUN_IFELSE]) -- -- AC_REQUIRE([AC_GNU_SOURCE]) -- AC_REQUIRE([AC_AIX]) -- AC_REQUIRE([AC_MINIX]) -- -- AH_VERBATIM([__EXTENSIONS__], --[/* Enable extensions on Solaris. */ --#ifndef __EXTENSIONS__ --# undef __EXTENSIONS__ --#endif --#ifndef _POSIX_PTHREAD_SEMANTICS --# undef _POSIX_PTHREAD_SEMANTICS --#endif --#ifndef _TANDEM_SOURCE --# undef _TANDEM_SOURCE --#endif]) -- AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__], -- [ac_cv_safe_to_define___extensions__], -- [AC_COMPILE_IFELSE( -- [AC_LANG_PROGRAM([ --# define __EXTENSIONS__ 1 -- AC_INCLUDES_DEFAULT])], -- [ac_cv_safe_to_define___extensions__=yes], -- [ac_cv_safe_to_define___extensions__=no])]) -- test $ac_cv_safe_to_define___extensions__ = yes && -- AC_DEFINE([__EXTENSIONS__]) -- AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) -- AC_DEFINE([_TANDEM_SOURCE]) --]) -- - # gl_USE_SYSTEM_EXTENSIONS - # ------------------------ - # Enable extensions on systems that normally disable them, diff --git a/meta/recipes-extended/gzip/gzip.inc b/meta/recipes-extended/gzip/gzip.inc index 04f8f95dd5..b32584033b 100644 --- a/meta/recipes-extended/gzip/gzip.inc +++ b/meta/recipes-extended/gzip/gzip.inc @@ -3,15 +3,14 @@ DESCRIPTION = "GNU Gzip is a popular data compression program originally written project. Mark Adler wrote the decompression part" HOMEPAGE = "http://www.gnu.org/software/gzip/" SECTION = "console/utils" -# change to GPLv3+ in 2007/07. Previous GPLv2 version is 1.3.12 inherit autotools texinfo export DEFS="NO_ASM" -EXTRA_OEMAKE_class-target = "GREP=${base_bindir}/grep" -EXTRA_OECONF_append_libc-musl = " gl_cv_func_fflush_stdin=yes " +EXTRA_OEMAKE:class-target = "GREP=${base_bindir}/grep" +EXTRA_OECONF:append:libc-musl = " gl_cv_func_fflush_stdin=yes " -do_install_append () { +do_install:append () { if [ "${base_bindir}" != "${bindir}" ]; then # Rename and move files into /bin (FHS), which is typical place for gzip install -d ${D}${base_bindir} @@ -25,7 +24,7 @@ do_install_append () { inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "gunzip gzip zcat" +ALTERNATIVE:${PN} = "gunzip gzip zcat" ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip" ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip" ALTERNATIVE_LINK_NAME[zcat] = "${base_bindir}/zcat" diff --git a/meta/recipes-extended/gzip/gzip_1.12.bb b/meta/recipes-extended/gzip/gzip_1.12.bb new file mode 100644 index 0000000000..14de50b230 --- /dev/null +++ b/meta/recipes-extended/gzip/gzip_1.12.bb @@ -0,0 +1,41 @@ +require gzip.inc + +# change to GPL-3.0-or-later in 2007/07. Previous GPL-2.0-or-later version is +# 1.3.12 +LICENSE = "GPL-3.0-or-later" + +SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz \ + file://run-ptest \ + " +SRC_URI:append:class-target = " file://wrong-path-fix.patch" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e" + +PROVIDES:append:class-native = " gzip-replacement-native" + +RDEPENDS:${PN}-ptest += "make perl grep diffutils" + +BBCLASSEXTEND = "native nativesdk" + +inherit ptest + +do_install_ptest() { + mkdir -p ${D}${PTEST_PATH}/src/build-aux + cp ${S}/build-aux/test-driver ${D}${PTEST_PATH}/src/build-aux/ + mkdir -p ${D}${PTEST_PATH}/src/tests + cp -r ${S}/tests/* ${D}${PTEST_PATH}/src/tests + sed -e 's/^abs_srcdir = ..*/abs_srcdir = \.\./' \ + -e 's/^top_srcdir = ..*/top_srcdir = \.\./' \ + -e 's/^GREP = ..*/GREP = grep/' \ + -e 's/^AWK = ..*/AWK = awk/' \ + -e 's/^srcdir = ..*/srcdir = \./' \ + -e 's/^Makefile: ..*/Makefile: /' \ + -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ + ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile +} + +SRC_URI[sha256sum] = "5b4fb14d38314e09f2fc8a1c510e7cd540a3ea0e3eb9b0420046b82c3bf41085" diff --git a/meta/recipes-extended/gzip/gzip_1.3.12.bb b/meta/recipes-extended/gzip/gzip_1.3.12.bb deleted file mode 100644 index e4062827bd..0000000000 --- a/meta/recipes-extended/gzip/gzip_1.3.12.bb +++ /dev/null @@ -1,15 +0,0 @@ -require gzip.inc - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ - file://gzip.h;endline=22;md5=c0934ad1900d927f86556153d4c76d23 \ - file://lzw.h;endline=19;md5=c273e09a02edd9801cc74d39683049e9 " - -SRC_URI = "${GNU_MIRROR}/gzip/gzip-${PV}.tar.gz \ - file://m4-extensions-fix.patch \ - file://dup-def-fix.patch" - -SRC_URI[md5sum] = "b5bac2d21840ae077e0217bc5e4845b1" -SRC_URI[sha256sum] = "3f565be05f7f3d1aff117c030eb7c738300510b7d098cedea796ca8e4cd587af" - -PR = "r2" diff --git a/meta/recipes-extended/gzip/gzip_1.8.bb b/meta/recipes-extended/gzip/gzip_1.8.bb deleted file mode 100644 index a19b965399..0000000000 --- a/meta/recipes-extended/gzip/gzip_1.8.bb +++ /dev/null @@ -1,18 +0,0 @@ -require gzip.inc - -LICENSE = "GPLv3+" - -SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz" -SRC_URI_append_class-target = " file://wrong-path-fix.patch" - -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e" - -PROVIDES_append_class-native = " gzip-replacement-native" -NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" - -BBCLASSEXTEND = "native" - -SRC_URI[md5sum] = "732553152814b22dc35aa0267df5286c" -SRC_URI[sha256sum] = "1ff7aedb3d66a0d73f442f6261e4b3860df6fd6c94025c2cb31a202c9c60fe0e" - |