diff options
author | Maxin B. John <maxin.john@enea.com> | 2013-10-24 13:40:56 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-26 16:08:41 +0100 |
commit | 78b91ab23d9856525fc7ac1bb8da2975382813bf (patch) | |
tree | 5343bb2028315cc1852965308578fe07e84b7ce9 | |
parent | 31d041bdb1e0994cc7462c6e089faecb58c84960 (diff) | |
download | poky-78b91ab23d9856525fc7ac1bb8da2975382813bf.tar.gz |
pigz: bump to 2.3.1
Update pigz to latest release - 2.3.1
Drop ldflags.patch as it has been merged upstream
(From OE-Core rev: 8081dcb03f54efd551d1c8fe8a0484f8270053e0)
Signed-off-by: Maxin B. John <maxin.john@enea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 @@ | |||
1 | Link using the bitbake LDFLAGS. | ||
2 | |||
3 | Signed-off-by: Björn Stenberg <bjst@enea.com> | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | |||
7 | Index: 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/" | |||
7 | SECTION = "console/utils" | 7 | SECTION = "console/utils" |
8 | LICENSE = "Zlib" | 8 | LICENSE = "Zlib" |
9 | 9 | ||
10 | PR = "r1" | 10 | SRC_URI = "http://zlib.net/pigz/pigz-${PV}.tar.gz" |
11 | |||
12 | SRC_URI = "http://zlib.net/pigz/pigz-${PV}.tar.gz \ | ||
13 | file://ldflags.patch" | ||
14 | 11 | ||
15 | PROVIDES_class-native += "gzip-native" | 12 | PROVIDES_class-native += "gzip-native" |
16 | 13 | ||
@@ -33,4 +30,3 @@ ALTERNATIVE_${PN} = "gzip gunzip" | |||
33 | ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip" | 30 | ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip" |
34 | ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip" | 31 | ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip" |
35 | ALTERNATIVE_PRIORITY = "80" | 32 | ALTERNATIVE_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 @@ | |||
1 | require pigz.inc | 1 | require pigz.inc |
2 | LIC_FILES_CHKSUM = "file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95" | 2 | LIC_FILES_CHKSUM = "file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95" |
3 | 3 | ||
4 | SRC_URI[md5sum] = "042e3322534f2c3d761736350cac303f" | 4 | SRC_URI[md5sum] = "e803f8bc0770c7a5e96dccb1d2dd2aab" |
5 | SRC_URI[sha256sum] = "74bbd5962f9420549fc987ddd1ccda692ec2b29d2d612fbbe26edf3fa348ff21" | 5 | SRC_URI[sha256sum] = "629b0ce5422a3978f31742bf8275d0be2f84987140d18f390f1e3b4e46e0af54" |
6 | 6 | ||
7 | NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" | 7 | NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" |
8 | 8 | ||