diff options
| -rw-r--r-- | meta/recipes-extended/pigz/files/ldflags.patch | 19 | ||||
| -rw-r--r-- | meta/recipes-extended/pigz/pigz.inc | 6 | ||||
| -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 @@ -Link using the bitbake LDFLAGS. - -Signed-off-by: Björn Stenberg <bjst@enea.com> - -Upstream-Status: Pending - -Index: pigz-2.3/Makefile -=================================================================== ---- pigz-2.3.orig/Makefile -+++ pigz-2.3/Makefile -@@ -3,7 +3,7 @@ CFLAGS=-O3 -Wall -Wextra - - - 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 -- $(CC) -o pigz $^ -lpthread -lz -+ $(CC) ${LDFLAGS} -o pigz $^ -lpthread -lz -lm - ln -f pigz unpigz - - 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/" SECTION = "console/utils" LICENSE = "Zlib" -PR = "r1" - -SRC_URI = "http://zlib.net/pigz/pigz-${PV}.tar.gz \ - file://ldflags.patch" +SRC_URI = "http://zlib.net/pigz/pigz-${PV}.tar.gz" PROVIDES_class-native += "gzip-native" @@ -33,4 +30,3 @@ ALTERNATIVE_${PN} = "gzip gunzip" ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip" ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip" ALTERNATIVE_PRIORITY = "80" - 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 @@ require pigz.inc LIC_FILES_CHKSUM = "file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95" -SRC_URI[md5sum] = "042e3322534f2c3d761736350cac303f" -SRC_URI[sha256sum] = "74bbd5962f9420549fc987ddd1ccda692ec2b29d2d612fbbe26edf3fa348ff21" +SRC_URI[md5sum] = "e803f8bc0770c7a5e96dccb1d2dd2aab" +SRC_URI[sha256sum] = "629b0ce5422a3978f31742bf8275d0be2f84987140d18f390f1e3b4e46e0af54" NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" |