summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/pigz/pigz
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-01-28 09:20:38 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-03 14:53:53 +0000
commit93842f0ec96b6e0f7863441f6ae02febe8a24a62 (patch)
treef1b6242a82b05a8225ba4ba46535553ead64a1ca /meta/recipes-extended/pigz/pigz
parent57647c9cbb56c7f115ebd5eeaee3f6e90a80ed8b (diff)
downloadpoky-93842f0ec96b6e0f7863441f6ae02febe8a24a62.tar.gz
pigz: Upgrade to 2.3.3
Fix build issues due to libz being required but is specified before use. Change-Id: I1f26c8e656b330a4b5f1eeffee7ac13500fa98d0 (From OE-Core rev: c939b9cc5bd046261981dcaae6cae9d358ed7671) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/pigz/pigz')
-rw-r--r--meta/recipes-extended/pigz/pigz/link-order.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-extended/pigz/pigz/link-order.patch b/meta/recipes-extended/pigz/pigz/link-order.patch
new file mode 100644
index 0000000000..4becc0e3fe
--- /dev/null
+++ b/meta/recipes-extended/pigz/pigz/link-order.patch
@@ -0,0 +1,38 @@
1This patch avoids underlinking issues since we pass -lz via LDFLAGS but it appears
2before pigz.o which needs symbols from libz however due to order linker happily discards libz
3
4Upstream-Status: Pending
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7
8Index: 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