diff options
Diffstat (limited to 'poky/meta/recipes-extended/pixz')
4 files changed, 191 insertions, 0 deletions
diff --git a/poky/meta/recipes-extended/pixz/pixz/0001-configure-Detect-headers-before-using-them.patch b/poky/meta/recipes-extended/pixz/pixz/0001-configure-Detect-headers-before-using-them.patch new file mode 100644 index 000000000..12bae28dc --- /dev/null +++ b/poky/meta/recipes-extended/pixz/pixz/0001-configure-Detect-headers-before-using-them.patch @@ -0,0 +1,51 @@ +From c84480be8df6966c538d1fb67ccae2f42cc46421 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 22 Mar 2016 07:36:54 +0000 +Subject: [PATCH 1/2] configure: Detect headers before using them + +Current logic does not work when system does not have +sys/endian.h, since it tried to reuse the cached results +from first try of detecting htole64 in sys/endian.h which is +'no' and hence the second try to look into endian.h also +comes out negative. + +So we check for header and then run the test for symbols +and these symbols are not standard and we need to define _GNU_SOURCE +for it to work, this issue is exposed by systems using musl e.g. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Submitted + + configure.ac | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4cb56bc..5e23c50 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -69,12 +69,17 @@ AC_FUNC_MALLOC + AC_FUNC_REALLOC + AC_FUNC_STRTOD + AC_CHECK_FUNCS([memchr memmove memset strerror strtol]) +-AC_CHECK_DECLS([htole64, le64toh], +- [], ++AC_CHECK_HEADER([sys/endian.h], + [ +- AC_CHECK_DECLS([htole64, le64toh], [], [], [#include <endian.h>]) ++ AC_CHECK_DECLS([htole64, le64toh], [], [], [#define _GNU_SOURCE 1 #include <sys/endian.h>]) + ], +- [#include <sys/endian.h>]) ++ [], []) ++ ++AC_CHECK_HEADER([endian.h], ++ [ ++ AC_CHECK_DECLS([htole64, le64toh], [], [], [#define _GNU_SOURCE 1 #include <endian.h>]) ++ ], ++ [], []) + + AC_CONFIG_FILES([Makefile + src/Makefile +-- +1.8.3.1 + diff --git a/poky/meta/recipes-extended/pixz/pixz/0002-endian-Use-macro-bswap_64-instead-of-__bswap_64.patch b/poky/meta/recipes-extended/pixz/pixz/0002-endian-Use-macro-bswap_64-instead-of-__bswap_64.patch new file mode 100644 index 000000000..6b615988d --- /dev/null +++ b/poky/meta/recipes-extended/pixz/pixz/0002-endian-Use-macro-bswap_64-instead-of-__bswap_64.patch @@ -0,0 +1,47 @@ +From 5f3a535987bae4c3e3d9e9079c7526e399f7aecd Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 22 Mar 2016 07:42:39 +0000 +Subject: [PATCH 2/2] endian: Use macro bswap_64 instead of __bswap_64 + +byteswap.h defines then as public APIs on all libc +on linux including musl + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Submitted + src/endian.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/endian.c b/src/endian.c +index b7724f3..51aea58 100644 +--- a/src/endian.c ++++ b/src/endian.c +@@ -15,6 +15,7 @@ void xle64enc(uint8_t *d, uint64_t n) { + #include <stdint.h> + #ifdef __linux__ + #include <endian.h> ++ #include <byteswap.h> + #else + #include <sys/endian.h> + #endif +@@ -23,7 +24,7 @@ void xle64enc(uint8_t *d, uint64_t n) { + # if __BYTE_ORDER == __LITTLE_ENDIAN + # define htole64(x) (x) + # else +-# define htole64(x) __bswap_64 (x) ++# define htole64(x) bswap_64 (x) + # endif + #endif + +@@ -31,7 +32,7 @@ void xle64enc(uint8_t *d, uint64_t n) { + # if __BYTE_ORDER == __LITTLE_ENDIAN + # define le64toh(x) (x) + # else +-# define le64toh(x) __bswap_64 (x) ++# define le64toh(x) bswap_64 (x) + # endif + #endif + +-- +1.8.3.1 + diff --git a/poky/meta/recipes-extended/pixz/pixz/936d8068ae19d95260d3058f41dd6cf718101cd6.patch b/poky/meta/recipes-extended/pixz/pixz/936d8068ae19d95260d3058f41dd6cf718101cd6.patch new file mode 100644 index 000000000..e3489db5b --- /dev/null +++ b/poky/meta/recipes-extended/pixz/pixz/936d8068ae19d95260d3058f41dd6cf718101cd6.patch @@ -0,0 +1,68 @@ +From 936d8068ae19d95260d3058f41dd6cf718101cd6 Mon Sep 17 00:00:00 2001 +From: Christian Krause <kizkizzbangbang@googlemail.com> +Date: Sat, 26 Dec 2015 14:36:17 +0100 +Subject: [PATCH] option to not build man page + +fixes #56 +--- + configure.ac | 23 +++++++++++++++++++---- + src/Makefile.am | 2 ++ + 2 files changed, 21 insertions(+), 4 deletions(-) + +Upstream-Status: Backport +RP 2016/01/22 + +diff --git a/configure.ac b/configure.ac +index b437e56..4cb56bc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -20,13 +20,28 @@ AC_CHECK_FILE( + [src/pixz.1], + [], + [ +- AC_CHECK_PROG(A2X, a2x, a2x, []) +- if test "x$A2X" = x ; then +- AC_MSG_ERROR([AsciiDoc not found, not able to generate the man page.]) +- fi ++ AC_ARG_WITH( ++ [manpage], ++ [ --without-manpage don't build man page], ++ [case ${withval} in ++ yes) manpage=true ;; ++ no) manpage=false ;; ++ *) AC_MSG_ERROR([bad value ${withval} for --with-manpage]) ;; ++ esac], ++ [manpage=true] ++ ) + ] + ) + ++AM_CONDITIONAL([MANPAGE], [test x$manpage = xtrue]) ++ ++if test x$manpage = xtrue ; then ++ AC_CHECK_PROG(A2X, a2x, a2x, []) ++ if test "x$A2X" = x ; then ++ AC_MSG_ERROR([AsciiDoc not found, not able to generate the man page.]) ++ fi ++fi ++ + # Checks for libraries. + AC_CHECK_LIB([m], [ceil]) + AX_PTHREAD +diff --git a/src/Makefile.am b/src/Makefile.am +index 600ec90..b98f450 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -15,6 +15,7 @@ pixz_SOURCES = \ + read.c \ + write.c + ++if MANPAGE + # TODO remove when possible: This is a hack because a2x is not able to output the man pages to a + # specific directory, only to where the source is. + pixz.1: pixz.1.asciidoc +@@ -26,3 +27,4 @@ man_MANS = pixz.1 + CLEANFILES = pixz.1 + + EXTRA_DIST = $(man_MANS) pixz.1.asciidoc ++endif diff --git a/poky/meta/recipes-extended/pixz/pixz_1.0.6.bb b/poky/meta/recipes-extended/pixz/pixz_1.0.6.bb new file mode 100644 index 000000000..303258658 --- /dev/null +++ b/poky/meta/recipes-extended/pixz/pixz_1.0.6.bb @@ -0,0 +1,25 @@ +SUMMARY = "Parallel, indexed xz compressor" + +DEPENDS = "xz libarchive" + +SRC_URI = "https://github.com/vasi/pixz/releases/download/v${PV}/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "f6dc5909c9a31b192f69aa397ae8df48" +SRC_URI[sha256sum] = "02c50746b134fa1b1aae41fcc314d7c6f1919b3d48bcdea01bf11769f83f72e8" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5cf6d164086105f1512ccb81bfff1926" + +SRC_URI += "file://936d8068ae19d95260d3058f41dd6cf718101cd6.patch \ + file://0001-configure-Detect-headers-before-using-them.patch \ + file://0002-endian-Use-macro-bswap_64-instead-of-__bswap_64.patch \ +" +UPSTREAM_CHECK_URI = "https://github.com/vasi/pixz/releases" + +PACKAGECONFIG[manpages] = "--with-manpage, --without-manpage, asciidoc-native" + +CFLAGS_append_libc-musl = " -D_GNU_SOURCE" +CACHED_CONFIGUREVARS += "ac_cv_file_src_pixz_1=no" + +inherit autotools pkgconfig manpages + +BBCLASSEXTEND = "native" |
