summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-04-09 16:20:26 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-04 13:28:04 +0100
commit733056f7ba55c11d9d170b0d7c012e143cfe870d (patch)
tree0af5896bcbdd923af5186fda62ab8d07ddf6ac76 /meta/recipes-extended
parent3bcba3406c7e465578b3fe9aa8863680209243b3 (diff)
downloadpoky-733056f7ba55c11d9d170b0d7c012e143cfe870d.tar.gz
pixz: remove
Nothing in oe-core is using this now as xz can do multithreaded compression, so remove it. (From OE-Core rev: 0c705d112736c90f6a9051c435d430f6aeb4842a) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/pixz/pixz/0001-configure-Detect-headers-before-using-them.patch51
-rw-r--r--meta/recipes-extended/pixz/pixz/0002-endian-Use-macro-bswap_64-instead-of-__bswap_64.patch47
-rw-r--r--meta/recipes-extended/pixz/pixz/936d8068ae19d95260d3058f41dd6cf718101cd6.patch68
-rw-r--r--meta/recipes-extended/pixz/pixz_1.0.6.bb25
4 files changed, 0 insertions, 191 deletions
diff --git a/meta/recipes-extended/pixz/pixz/0001-configure-Detect-headers-before-using-them.patch b/meta/recipes-extended/pixz/pixz/0001-configure-Detect-headers-before-using-them.patch
deleted file mode 100644
index 12bae28dc7..0000000000
--- a/meta/recipes-extended/pixz/pixz/0001-configure-Detect-headers-before-using-them.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From c84480be8df6966c538d1fb67ccae2f42cc46421 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 22 Mar 2016 07:36:54 +0000
4Subject: [PATCH 1/2] configure: Detect headers before using them
5
6Current logic does not work when system does not have
7sys/endian.h, since it tried to reuse the cached results
8from first try of detecting htole64 in sys/endian.h which is
9'no' and hence the second try to look into endian.h also
10comes out negative.
11
12So we check for header and then run the test for symbols
13and these symbols are not standard and we need to define _GNU_SOURCE
14for it to work, this issue is exposed by systems using musl e.g.
15
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17---
18Upstream-Status: Submitted
19
20 configure.ac | 13 +++++++++----
21 1 file changed, 9 insertions(+), 4 deletions(-)
22
23diff --git a/configure.ac b/configure.ac
24index 4cb56bc..5e23c50 100644
25--- a/configure.ac
26+++ b/configure.ac
27@@ -69,12 +69,17 @@ AC_FUNC_MALLOC
28 AC_FUNC_REALLOC
29 AC_FUNC_STRTOD
30 AC_CHECK_FUNCS([memchr memmove memset strerror strtol])
31-AC_CHECK_DECLS([htole64, le64toh],
32- [],
33+AC_CHECK_HEADER([sys/endian.h],
34 [
35- AC_CHECK_DECLS([htole64, le64toh], [], [], [#include <endian.h>])
36+ AC_CHECK_DECLS([htole64, le64toh], [], [], [#define _GNU_SOURCE 1 #include <sys/endian.h>])
37 ],
38- [#include <sys/endian.h>])
39+ [], [])
40+
41+AC_CHECK_HEADER([endian.h],
42+ [
43+ AC_CHECK_DECLS([htole64, le64toh], [], [], [#define _GNU_SOURCE 1 #include <endian.h>])
44+ ],
45+ [], [])
46
47 AC_CONFIG_FILES([Makefile
48 src/Makefile
49--
501.8.3.1
51
diff --git a/meta/recipes-extended/pixz/pixz/0002-endian-Use-macro-bswap_64-instead-of-__bswap_64.patch b/meta/recipes-extended/pixz/pixz/0002-endian-Use-macro-bswap_64-instead-of-__bswap_64.patch
deleted file mode 100644
index 6b615988db..0000000000
--- a/meta/recipes-extended/pixz/pixz/0002-endian-Use-macro-bswap_64-instead-of-__bswap_64.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From 5f3a535987bae4c3e3d9e9079c7526e399f7aecd Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 22 Mar 2016 07:42:39 +0000
4Subject: [PATCH 2/2] endian: Use macro bswap_64 instead of __bswap_64
5
6byteswap.h defines then as public APIs on all libc
7on linux including musl
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11Upstream-Status: Submitted
12 src/endian.c | 5 +++--
13 1 file changed, 3 insertions(+), 2 deletions(-)
14
15diff --git a/src/endian.c b/src/endian.c
16index b7724f3..51aea58 100644
17--- a/src/endian.c
18+++ b/src/endian.c
19@@ -15,6 +15,7 @@ void xle64enc(uint8_t *d, uint64_t n) {
20 #include <stdint.h>
21 #ifdef __linux__
22 #include <endian.h>
23+ #include <byteswap.h>
24 #else
25 #include <sys/endian.h>
26 #endif
27@@ -23,7 +24,7 @@ void xle64enc(uint8_t *d, uint64_t n) {
28 # if __BYTE_ORDER == __LITTLE_ENDIAN
29 # define htole64(x) (x)
30 # else
31-# define htole64(x) __bswap_64 (x)
32+# define htole64(x) bswap_64 (x)
33 # endif
34 #endif
35
36@@ -31,7 +32,7 @@ void xle64enc(uint8_t *d, uint64_t n) {
37 # if __BYTE_ORDER == __LITTLE_ENDIAN
38 # define le64toh(x) (x)
39 # else
40-# define le64toh(x) __bswap_64 (x)
41+# define le64toh(x) bswap_64 (x)
42 # endif
43 #endif
44
45--
461.8.3.1
47
diff --git a/meta/recipes-extended/pixz/pixz/936d8068ae19d95260d3058f41dd6cf718101cd6.patch b/meta/recipes-extended/pixz/pixz/936d8068ae19d95260d3058f41dd6cf718101cd6.patch
deleted file mode 100644
index e3489db5b8..0000000000
--- a/meta/recipes-extended/pixz/pixz/936d8068ae19d95260d3058f41dd6cf718101cd6.patch
+++ /dev/null
@@ -1,68 +0,0 @@
1From 936d8068ae19d95260d3058f41dd6cf718101cd6 Mon Sep 17 00:00:00 2001
2From: Christian Krause <kizkizzbangbang@googlemail.com>
3Date: Sat, 26 Dec 2015 14:36:17 +0100
4Subject: [PATCH] option to not build man page
5
6fixes #56
7---
8 configure.ac | 23 +++++++++++++++++++----
9 src/Makefile.am | 2 ++
10 2 files changed, 21 insertions(+), 4 deletions(-)
11
12Upstream-Status: Backport
13RP 2016/01/22
14
15diff --git a/configure.ac b/configure.ac
16index b437e56..4cb56bc 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -20,13 +20,28 @@ AC_CHECK_FILE(
20 [src/pixz.1],
21 [],
22 [
23- AC_CHECK_PROG(A2X, a2x, a2x, [])
24- if test "x$A2X" = x ; then
25- AC_MSG_ERROR([AsciiDoc not found, not able to generate the man page.])
26- fi
27+ AC_ARG_WITH(
28+ [manpage],
29+ [ --without-manpage don't build man page],
30+ [case ${withval} in
31+ yes) manpage=true ;;
32+ no) manpage=false ;;
33+ *) AC_MSG_ERROR([bad value ${withval} for --with-manpage]) ;;
34+ esac],
35+ [manpage=true]
36+ )
37 ]
38 )
39
40+AM_CONDITIONAL([MANPAGE], [test x$manpage = xtrue])
41+
42+if test x$manpage = xtrue ; then
43+ AC_CHECK_PROG(A2X, a2x, a2x, [])
44+ if test "x$A2X" = x ; then
45+ AC_MSG_ERROR([AsciiDoc not found, not able to generate the man page.])
46+ fi
47+fi
48+
49 # Checks for libraries.
50 AC_CHECK_LIB([m], [ceil])
51 AX_PTHREAD
52diff --git a/src/Makefile.am b/src/Makefile.am
53index 600ec90..b98f450 100644
54--- a/src/Makefile.am
55+++ b/src/Makefile.am
56@@ -15,6 +15,7 @@ pixz_SOURCES = \
57 read.c \
58 write.c
59
60+if MANPAGE
61 # TODO remove when possible: This is a hack because a2x is not able to output the man pages to a
62 # specific directory, only to where the source is.
63 pixz.1: pixz.1.asciidoc
64@@ -26,3 +27,4 @@ man_MANS = pixz.1
65 CLEANFILES = pixz.1
66
67 EXTRA_DIST = $(man_MANS) pixz.1.asciidoc
68+endif
diff --git a/meta/recipes-extended/pixz/pixz_1.0.6.bb b/meta/recipes-extended/pixz/pixz_1.0.6.bb
deleted file mode 100644
index 3032586581..0000000000
--- a/meta/recipes-extended/pixz/pixz_1.0.6.bb
+++ /dev/null
@@ -1,25 +0,0 @@
1SUMMARY = "Parallel, indexed xz compressor"
2
3DEPENDS = "xz libarchive"
4
5SRC_URI = "https://github.com/vasi/pixz/releases/download/v${PV}/${BPN}-${PV}.tar.xz"
6SRC_URI[md5sum] = "f6dc5909c9a31b192f69aa397ae8df48"
7SRC_URI[sha256sum] = "02c50746b134fa1b1aae41fcc314d7c6f1919b3d48bcdea01bf11769f83f72e8"
8
9LICENSE = "BSD-2-Clause"
10LIC_FILES_CHKSUM = "file://LICENSE;md5=5cf6d164086105f1512ccb81bfff1926"
11
12SRC_URI += "file://936d8068ae19d95260d3058f41dd6cf718101cd6.patch \
13 file://0001-configure-Detect-headers-before-using-them.patch \
14 file://0002-endian-Use-macro-bswap_64-instead-of-__bswap_64.patch \
15"
16UPSTREAM_CHECK_URI = "https://github.com/vasi/pixz/releases"
17
18PACKAGECONFIG[manpages] = "--with-manpage, --without-manpage, asciidoc-native"
19
20CFLAGS_append_libc-musl = " -D_GNU_SOURCE"
21CACHED_CONFIGUREVARS += "ac_cv_file_src_pixz_1=no"
22
23inherit autotools pkgconfig manpages
24
25BBCLASSEXTEND = "native"