summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/pigz/pigz/link-order.patch38
-rw-r--r--meta/recipes-extended/pigz/pigz_2.3.3.bb14
-rw-r--r--meta/recipes-extended/pigz/pigz_2.3.4.bb12
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 @@
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
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 @@
1require pigz.inc
2LIC_FILES_CHKSUM = "file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95"
3
4UPSTREAM_CHECK_URI = "http://zlib.net/${BPN}/"
5SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/${BP}.tar.gz"
6SRC_URI += "file://link-order.patch"
7
8SRC_URI[md5sum] = "01d7a16cce77929cc1a78aa1bdfb68cb"
9SRC_URI[sha256sum] = "4e8b67b432ce7907575a549f3e1cac4709781ba0f6b48afea9f59369846b509c"
10
11NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
12
13BBCLASSEXTEND = "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 @@
1require pigz.inc
2LIC_FILES_CHKSUM = "file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95"
3
4UPSTREAM_CHECK_URI = "http://zlib.net/${BPN}/"
5SRC_URI = "https://github.com/madler/pigz/archive/v${PV}.tar.gz"
6SRC_URI[md5sum] = "c109057050b15edf3eb9bb4d0805235e"
7SRC_URI[sha256sum] = "763f2fdb203aa0b7b640e63385e38e5dd4e5aaa041bc8e42aa96f2ef156b06e8"
8
9NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
10
11BBCLASSEXTEND = "native nativesdk"
12