[oe-commits] Saul Wold : pigz: Update to 2.3

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: f235a69f8d5cee6f6d8e7feccd83e8e619e2ddcf
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f235a69f8d5cee6f6d8e7feccd83e8e619e2ddcf

Author: Saul Wold <sgw at linux.intel.com>
Date:   Sat Mar 16 19:34:59 2013 -0700

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 at linux.intel.com>

---

 meta/recipes-extended/pigz/files/ldflags.patch     |   18 ++++++++++--------
 .../pigz/{pigz_2.2.5.bb => pigz_2.3.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 928c3a5..8e531cc 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 at 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
similarity index 55%
rename from meta/recipes-extended/pigz/pigz_2.2.5.bb
rename to meta/recipes-extended/pigz/pigz_2.3.bb
index 76c7c6c..724d00b 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"