summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/pigz/files/ldflags.patch19
-rw-r--r--meta/recipes-extended/pigz/pigz.inc6
-rw-r--r--meta/recipes-extended/pigz/pigz_2.3.1.bb (renamed from meta/recipes-extended/pigz/pigz_2.3.bb)4
3 files changed, 3 insertions, 26 deletions
diff --git a/meta/recipes-extended/pigz/files/ldflags.patch b/meta/recipes-extended/pigz/files/ldflags.patch
deleted file mode 100644
index 8e531ccb5d..0000000000
--- a/meta/recipes-extended/pigz/files/ldflags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1Link using the bitbake LDFLAGS.
2
3Signed-off-by: Björn Stenberg <bjst@enea.com>
4
5Upstream-Status: Pending
6
7Index: pigz-2.3/Makefile
8===================================================================
9--- pigz-2.3.orig/Makefile
10+++ pigz-2.3/Makefile
11@@ -3,7 +3,7 @@ CFLAGS=-O3 -Wall -Wextra
12
13
14 pigz: pigz.o yarn.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
15- $(CC) -o pigz $^ -lpthread -lz
16+ $(CC) ${LDFLAGS} -o pigz $^ -lpthread -lz -lm
17 ln -f pigz unpigz
18
19 pigz.o: pigz.c yarn.h zopfli/deflate.h zopfli/util.h
diff --git a/meta/recipes-extended/pigz/pigz.inc b/meta/recipes-extended/pigz/pigz.inc
index 5ceaef21d9..355fb2a4ec 100644
--- a/meta/recipes-extended/pigz/pigz.inc
+++ b/meta/recipes-extended/pigz/pigz.inc
@@ -7,10 +7,7 @@ HOMEPAGE = "http://zlib.net/pigz/"
7SECTION = "console/utils" 7SECTION = "console/utils"
8LICENSE = "Zlib" 8LICENSE = "Zlib"
9 9
10PR = "r1" 10SRC_URI = "http://zlib.net/pigz/pigz-${PV}.tar.gz"
11
12SRC_URI = "http://zlib.net/pigz/pigz-${PV}.tar.gz \
13 file://ldflags.patch"
14 11
15PROVIDES_class-native += "gzip-native" 12PROVIDES_class-native += "gzip-native"
16 13
@@ -33,4 +30,3 @@ ALTERNATIVE_${PN} = "gzip gunzip"
33ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip" 30ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip"
34ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip" 31ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip"
35ALTERNATIVE_PRIORITY = "80" 32ALTERNATIVE_PRIORITY = "80"
36
diff --git a/meta/recipes-extended/pigz/pigz_2.3.bb b/meta/recipes-extended/pigz/pigz_2.3.1.bb
index 724d00bcf7..6e7c7f1f52 100644
--- a/meta/recipes-extended/pigz/pigz_2.3.bb
+++ b/meta/recipes-extended/pigz/pigz_2.3.1.bb
@@ -1,8 +1,8 @@
1require pigz.inc 1require pigz.inc
2LIC_FILES_CHKSUM = "file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95" 2LIC_FILES_CHKSUM = "file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95"
3 3
4SRC_URI[md5sum] = "042e3322534f2c3d761736350cac303f" 4SRC_URI[md5sum] = "e803f8bc0770c7a5e96dccb1d2dd2aab"
5SRC_URI[sha256sum] = "74bbd5962f9420549fc987ddd1ccda692ec2b29d2d612fbbe26edf3fa348ff21" 5SRC_URI[sha256sum] = "629b0ce5422a3978f31742bf8275d0be2f84987140d18f390f1e3b4e46e0af54"
6 6
7NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" 7NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
8 8