diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-22 12:58:11 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-24 09:40:34 +0000 |
commit | b54fa253104c6fec402f8b678337293589cc0545 (patch) | |
tree | 7708a32054230cad9f82d6f82daa32740fb849d3 /meta/recipes-extended | |
parent | d47572d3dd7ac442bd18205e8f740f2542814a23 (diff) | |
download | poky-b54fa253104c6fec402f8b678337293589cc0545.tar.gz |
pixz: Add 1.0.6
xz gives better compression results than bzip/gz but is often slower.
Using parallel compression mitigates this somewhat and is particularly
useful for the SDK.
Whilst xz does have some parallel support, pixz appears to perform better
and supports parallel decompression as well as a simpler command line.
(From OE-Core rev: b65ab3a38093023310b2f17251b27471cf857561)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/pixz/pixz/936d8068ae19d95260d3058f41dd6cf718101cd6.patch | 68 | ||||
-rw-r--r-- | meta/recipes-extended/pixz/pixz_1.0.6.bb | 24 |
2 files changed, 92 insertions, 0 deletions
diff --git a/meta/recipes-extended/pixz/pixz/936d8068ae19d95260d3058f41dd6cf718101cd6.patch b/meta/recipes-extended/pixz/pixz/936d8068ae19d95260d3058f41dd6cf718101cd6.patch new file mode 100644 index 0000000000..e3489db5b8 --- /dev/null +++ b/meta/recipes-extended/pixz/pixz/936d8068ae19d95260d3058f41dd6cf718101cd6.patch | |||
@@ -0,0 +1,68 @@ | |||
1 | From 936d8068ae19d95260d3058f41dd6cf718101cd6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Christian Krause <kizkizzbangbang@googlemail.com> | ||
3 | Date: Sat, 26 Dec 2015 14:36:17 +0100 | ||
4 | Subject: [PATCH] option to not build man page | ||
5 | |||
6 | fixes #56 | ||
7 | --- | ||
8 | configure.ac | 23 +++++++++++++++++++---- | ||
9 | src/Makefile.am | 2 ++ | ||
10 | 2 files changed, 21 insertions(+), 4 deletions(-) | ||
11 | |||
12 | Upstream-Status: Backport | ||
13 | RP 2016/01/22 | ||
14 | |||
15 | diff --git a/configure.ac b/configure.ac | ||
16 | index 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 | ||
52 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
53 | index 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 new file mode 100644 index 0000000000..492b7ef611 --- /dev/null +++ b/meta/recipes-extended/pixz/pixz_1.0.6.bb | |||
@@ -0,0 +1,24 @@ | |||
1 | SUMMARY = "Parallel, indexed xz compressor" | ||
2 | |||
3 | DEPENDS = "xz libarchive" | ||
4 | DEEPNDS_class-native = "xz-replacement-native libarchive-native" | ||
5 | |||
6 | SRC_URI = "https://github.com/vasi/pixz/releases/download/v${PV}/${BPN}-${PV}.tar.xz" | ||
7 | SRC_URI[md5sum] = "f6dc5909c9a31b192f69aa397ae8df48" | ||
8 | SRC_URI[sha256sum] = "02c50746b134fa1b1aae41fcc314d7c6f1919b3d48bcdea01bf11769f83f72e8" | ||
9 | |||
10 | LICENSE = "BSD-2-Clause" | ||
11 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5cf6d164086105f1512ccb81bfff1926" | ||
12 | |||
13 | SRC_URI += "file://936d8068ae19d95260d3058f41dd6cf718101cd6.patch" | ||
14 | |||
15 | EXTRA_OECONF += "--without-manpage" | ||
16 | |||
17 | CACHED_CONFIGUREVARS += "ac_cv_file_src_pixz_1=no" | ||
18 | |||
19 | inherit autotools pkgconfig | ||
20 | |||
21 | PKG_CONFIG_PATH_append_class-native = ":${STAGING_DIR_HOST}${libdir}/xz-native/pkgconfig" | ||
22 | BUILD_LDFLAGS_append_class-native = " -Wl,-rpath,${STAGING_DIR_HOST}${libdir}/xz-native/" | ||
23 | |||
24 | BBCLASSEXTEND = "native" | ||