diff options
| author |   Saul Wold <sgw@linux.intel.com> | 2013-03-16 19:34:59 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-18 13:17:38 +0000 |
| commit | f235a69f8d5cee6f6d8e7feccd83e8e619e2ddcf (patch) | |
| tree | 2d5759f48fa413b29f3adeab07a9603851740599 | |
| parent | c78785eb5dbfa7a25e4bab9e0c29d25d13b9eb29 (diff) | |
| download | openembedded-core-contrib-f235a69f8d5cee6f6d8e7feccd83e8e619e2ddcf.tar.gz | |
pigz: Update to 2.3
Rebased the patch and added math library to satify tree.c's log() requirement.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/recipes-extended/pigz/files/ldflags.patch | 18 | ||||
| -rw-r--r-- | meta/recipes-extended/pigz/pigz_2.3.bb (renamed from meta/recipes-extended/pigz/pigz_2.2.5.bb) | 7 |
2 files changed, 14 insertions, 11 deletions
diff --git a/meta/recipes-extended/pigz/files/ldflags.patch b/meta/recipes-extended/pigz/files/ldflags.patch index 928c3a57703..8e531ccb5de 100644 --- a/meta/recipes-extended/pigz/files/ldflags.patch +++ b/meta/recipes-extended/pigz/files/ldflags.patch @@ -4,14 +4,16 @@ Signed-off-by: Björn Stenberg <bjst@enea.com> Upstream-Status: Pending ---- pigz-2.2.4/Makefile.orig 2012-01-01 02:46:58.000000000 +0100 -+++ pigz-2.2.4/Makefile 2012-03-09 08:47:40.025094863 +0100 -@@ -2,7 +2,7 @@ - CFLAGS=-O3 -Wall -Wextra +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 -- $(CC) -o pigz pigz.o yarn.o -lpthread -lz -+ $(CC) $(LDFLAGS) -o pigz pigz.o yarn.o -lpthread -lz + + 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 + pigz.o: pigz.c yarn.h zopfli/deflate.h zopfli/util.h diff --git a/meta/recipes-extended/pigz/pigz_2.2.5.bb b/meta/recipes-extended/pigz/pigz_2.3.bb index 76c7c6c5acd..724d00bcf7f 100644 --- a/meta/recipes-extended/pigz/pigz_2.2.5.bb +++ b/meta/recipes-extended/pigz/pigz_2.3.bb @@ -1,9 +1,10 @@ require pigz.inc +LIC_FILES_CHKSUM = "file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95" + +SRC_URI[md5sum] = "042e3322534f2c3d761736350cac303f" +SRC_URI[sha256sum] = "74bbd5962f9420549fc987ddd1ccda692ec2b29d2d612fbbe26edf3fa348ff21" NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "188f769ccedc403893d03049ad31e969" -SRC_URI[sha256sum] = "e37498cbf3a475d7ebe2519751188c29564bf8dd27ba68bd3c7fe1ac08792759" -LIC_FILES_CHKSUM = "file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95" |