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:18:23 +0000 |
| commit | 05239ff8ef0a95aa6dc960e443f0a3af0a5ce997 (patch) | |
| tree | 5fcb6ce694ca3ece8949cbf168901f8e5f57eb86 /meta | |
| parent | 7a3d8f6c2bf8c65da84648a85bb95c02c99133dd (diff) | |
| download | poky-05239ff8ef0a95aa6dc960e443f0a3af0a5ce997.tar.gz | |
pigz: Update to 2.3
Rebased the patch and added math library to satify tree.c's log() requirement.
(From OE-Core rev: f235a69f8d5cee6f6d8e7feccd83e8e619e2ddcf)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -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 928c3a5770..8e531ccb5d 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> | |||
| 4 | 4 | ||
| 5 | Upstream-Status: Pending | 5 | Upstream-Status: Pending |
| 6 | 6 | ||
| 7 | --- pigz-2.2.4/Makefile.orig 2012-01-01 02:46:58.000000000 +0100 | 7 | Index: pigz-2.3/Makefile |
| 8 | +++ pigz-2.2.4/Makefile 2012-03-09 08:47:40.025094863 +0100 | 8 | =================================================================== |
| 9 | @@ -2,7 +2,7 @@ | 9 | --- pigz-2.3.orig/Makefile |
| 10 | CFLAGS=-O3 -Wall -Wextra | 10 | +++ pigz-2.3/Makefile |
| 11 | @@ -3,7 +3,7 @@ CFLAGS=-O3 -Wall -Wextra | ||
| 11 | 12 | ||
| 12 | pigz: pigz.o yarn.o | 13 | |
| 13 | - $(CC) -o pigz pigz.o yarn.o -lpthread -lz | 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 |
| 14 | + $(CC) $(LDFLAGS) -o pigz pigz.o yarn.o -lpthread -lz | 15 | - $(CC) -o pigz $^ -lpthread -lz |
| 16 | + $(CC) ${LDFLAGS} -o pigz $^ -lpthread -lz -lm | ||
| 15 | ln -f pigz unpigz | 17 | ln -f pigz unpigz |
| 16 | 18 | ||
| 17 | pigz.o: pigz.c yarn.h | 19 | 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 76c7c6c5ac..724d00bcf7 100644 --- a/meta/recipes-extended/pigz/pigz_2.2.5.bb +++ b/meta/recipes-extended/pigz/pigz_2.3.bb | |||
| @@ -1,9 +1,10 @@ | |||
| 1 | require pigz.inc | 1 | require pigz.inc |
| 2 | LIC_FILES_CHKSUM = "file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95" | ||
| 3 | |||
| 4 | SRC_URI[md5sum] = "042e3322534f2c3d761736350cac303f" | ||
| 5 | SRC_URI[sha256sum] = "74bbd5962f9420549fc987ddd1ccda692ec2b29d2d612fbbe26edf3fa348ff21" | ||
| 2 | 6 | ||
| 3 | NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" | 7 | NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" |
| 4 | 8 | ||
| 5 | BBCLASSEXTEND = "native" | 9 | BBCLASSEXTEND = "native" |
| 6 | 10 | ||
| 7 | SRC_URI[md5sum] = "188f769ccedc403893d03049ad31e969" | ||
| 8 | SRC_URI[sha256sum] = "e37498cbf3a475d7ebe2519751188c29564bf8dd27ba68bd3c7fe1ac08792759" | ||
| 9 | LIC_FILES_CHKSUM = "file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95" | ||