diff options
author | Fabio Berton <fabio.berton@ossystems.com.br> | 2016-11-21 17:58:52 -0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-30 15:48:05 +0000 |
commit | 427864afd7f6f30d46521fe97a6fbfa826516a74 (patch) | |
tree | be5d33723ce49ba4bf52baa49645f0774c856b33 /meta | |
parent | 948d50d87af119fc554c11fee70facc2115c03f1 (diff) | |
download | poky-427864afd7f6f30d46521fe97a6fbfa826516a74.tar.gz |
pigz: Update to version 2.3.4
- Change SRC_URI to fetch sources from Github archives. Pigz official
site maintains only the latest tarball version and Github have all
versions avaiable to download.
- Remove patch link-order.patch. The following commit fix this issue:
https://github.com/madler/pigz/commit/c3f91d1a12a6f
(From OE-Core rev: a6c2a2ce120a047d875ab1f1f9594403d1ff9dbc)
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/pigz/pigz/link-order.patch | 38 | ||||
-rw-r--r-- | meta/recipes-extended/pigz/pigz_2.3.3.bb | 14 | ||||
-rw-r--r-- | meta/recipes-extended/pigz/pigz_2.3.4.bb | 12 |
3 files changed, 12 insertions, 52 deletions
diff --git a/meta/recipes-extended/pigz/pigz/link-order.patch b/meta/recipes-extended/pigz/pigz/link-order.patch deleted file mode 100644 index 4becc0e3fe..0000000000 --- a/meta/recipes-extended/pigz/pigz/link-order.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | This patch avoids underlinking issues since we pass -lz via LDFLAGS but it appears | ||
2 | before pigz.o which needs symbols from libz however due to order linker happily discards libz | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | |||
8 | Index: pigz-2.3.3/Makefile | ||
9 | =================================================================== | ||
10 | --- pigz-2.3.3.orig/Makefile 2015-01-19 20:12:31.000000000 -0800 | ||
11 | +++ pigz-2.3.3/Makefile 2015-01-28 09:11:50.266669184 -0800 | ||
12 | @@ -5,7 +5,7 @@ | ||
13 | # use gcc and gmake on Solaris | ||
14 | |||
15 | pigz: pigz.o yarn.o try.o ${ZOPFLI}deflate.o ${ZOPFLI}blocksplitter.o ${ZOPFLI}tree.o ${ZOPFLI}lz77.o ${ZOPFLI}cache.o ${ZOPFLI}hash.o ${ZOPFLI}util.o ${ZOPFLI}squeeze.o ${ZOPFLI}katajainen.o | ||
16 | - $(CC) $(LDFLAGS) -o pigz $^ -lpthread -lm | ||
17 | + $(CC) -o pigz $^ $(LDFLAGS) -lz -lpthread -lm | ||
18 | ln -f pigz unpigz | ||
19 | |||
20 | pigz.o: pigz.c yarn.h try.h ${ZOPFLI}deflate.h ${ZOPFLI}util.h | ||
21 | @@ -35,7 +35,7 @@ | ||
22 | dev: pigz pigzt pigzn | ||
23 | |||
24 | pigzt: pigzt.o yarnt.o try.o ${ZOPFLI}deflate.o ${ZOPFLI}blocksplitter.o ${ZOPFLI}tree.o ${ZOPFLI}lz77.o ${ZOPFLI}cache.o ${ZOPFLI}hash.o ${ZOPFLI}util.o ${ZOPFLI}squeeze.o ${ZOPFLI}katajainen.o | ||
25 | - $(CC) $(LDFLAGS) -o pigzt $^ -lpthread -lm | ||
26 | + $(CC) -o pigzt $^ $(LDFLAGS) -lz -lpthread -lm | ||
27 | |||
28 | pigzt.o: pigz.c yarn.h try.h | ||
29 | $(CC) $(CFLAGS) -DDEBUG -g -c -o pigzt.o pigz.c | ||
30 | @@ -44,7 +44,7 @@ | ||
31 | $(CC) $(CFLAGS) -DDEBUG -g -c -o yarnt.o yarn.c | ||
32 | |||
33 | pigzn: pigzn.o tryn.o ${ZOPFLI}deflate.o ${ZOPFLI}blocksplitter.o ${ZOPFLI}tree.o ${ZOPFLI}lz77.o ${ZOPFLI}cache.o ${ZOPFLI}hash.o ${ZOPFLI}util.o ${ZOPFLI}squeeze.o ${ZOPFLI}katajainen.o | ||
34 | - $(CC) $(LDFLAGS) -o pigzn $^ -lm | ||
35 | + $(CC) -o pigzn $^ $(LDFLAGS) -lz -lm | ||
36 | |||
37 | pigzn.o: pigz.c try.h | ||
38 | $(CC) $(CFLAGS) -DDEBUG -DNOTHREAD -g -c -o pigzn.o pigz.c | ||
diff --git a/meta/recipes-extended/pigz/pigz_2.3.3.bb b/meta/recipes-extended/pigz/pigz_2.3.3.bb deleted file mode 100644 index b4fe831387..0000000000 --- a/meta/recipes-extended/pigz/pigz_2.3.3.bb +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | require pigz.inc | ||
2 | LIC_FILES_CHKSUM = "file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95" | ||
3 | |||
4 | UPSTREAM_CHECK_URI = "http://zlib.net/${BPN}/" | ||
5 | SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/${BP}.tar.gz" | ||
6 | SRC_URI += "file://link-order.patch" | ||
7 | |||
8 | SRC_URI[md5sum] = "01d7a16cce77929cc1a78aa1bdfb68cb" | ||
9 | SRC_URI[sha256sum] = "4e8b67b432ce7907575a549f3e1cac4709781ba0f6b48afea9f59369846b509c" | ||
10 | |||
11 | NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" | ||
12 | |||
13 | BBCLASSEXTEND = "native nativesdk" | ||
14 | |||
diff --git a/meta/recipes-extended/pigz/pigz_2.3.4.bb b/meta/recipes-extended/pigz/pigz_2.3.4.bb new file mode 100644 index 0000000000..49d9d78b35 --- /dev/null +++ b/meta/recipes-extended/pigz/pigz_2.3.4.bb | |||
@@ -0,0 +1,12 @@ | |||
1 | require pigz.inc | ||
2 | LIC_FILES_CHKSUM = "file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95" | ||
3 | |||
4 | UPSTREAM_CHECK_URI = "http://zlib.net/${BPN}/" | ||
5 | SRC_URI = "https://github.com/madler/pigz/archive/v${PV}.tar.gz" | ||
6 | SRC_URI[md5sum] = "c109057050b15edf3eb9bb4d0805235e" | ||
7 | SRC_URI[sha256sum] = "763f2fdb203aa0b7b640e63385e38e5dd4e5aaa041bc8e42aa96f2ef156b06e8" | ||
8 | |||
9 | NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" | ||
10 | |||
11 | BBCLASSEXTEND = "native nativesdk" | ||
12 | |||