diff options
Diffstat (limited to 'app-arch/pigz')
-rw-r--r-- | app-arch/pigz/Manifest | 2 | ||||
-rw-r--r-- | app-arch/pigz/files/0001-Do-not-return-non-zero-exit-code-when-warnings-issue.patch | 47 | ||||
-rw-r--r-- | app-arch/pigz/files/pigz-2.3-make.patch | 25 | ||||
-rw-r--r-- | app-arch/pigz/files/pigz-2.3.3-ldflags.patch | 34 | ||||
-rw-r--r-- | app-arch/pigz/metadata.xml | 12 | ||||
-rw-r--r-- | app-arch/pigz/pigz-2.3.1-r1.ebuild | 43 | ||||
-rw-r--r-- | app-arch/pigz/pigz-2.3.3.ebuild | 43 |
7 files changed, 206 insertions, 0 deletions
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest new file mode 100644 index 000000000000..756d069cebfb --- /dev/null +++ b/app-arch/pigz/Manifest @@ -0,0 +1,2 @@ +DIST pigz-2.3.1.tar.gz 86651 SHA256 629b0ce5422a3978f31742bf8275d0be2f84987140d18f390f1e3b4e46e0af54 SHA512 7cb00ab87802352c817d9b2f745948199a7e571181aec3ef161305c1d8b828790bc2fb0083d6068ba5aead5d8b8c7f53ec25ab641ae2e98eda9adf14f195dbc6 WHIRLPOOL 242e38d05215269c3c9b6602191cc6e02fd9e781b0425738c3907ccf60da9a4a36ebcda866c9c0e949ad5988dad6b468f97102352d2ed13adb7e890688c221f7 +DIST pigz-2.3.3.tar.gz 92787 SHA256 4e8b67b432ce7907575a549f3e1cac4709781ba0f6b48afea9f59369846b509c SHA512 6fa5ee1c03b4a8dc4b191acaa337b6f30132503ff413300214e1e6b27dd70590b53334be3fa880916f6ea4498beb8cf7c411a5954fdf188475882c44618c663c WHIRLPOOL 1eb3ea11a0bbb0bd837a1ed12a63b3d57d8ae9c127e8407f9b82b1aad8a41820abf1d429c513f4df3f56fdc3c842caab07a5c904207b2244e4215a6654ef5392 diff --git a/app-arch/pigz/files/0001-Do-not-return-non-zero-exit-code-when-warnings-issue.patch b/app-arch/pigz/files/0001-Do-not-return-non-zero-exit-code-when-warnings-issue.patch new file mode 100644 index 000000000000..9d2512e055a4 --- /dev/null +++ b/app-arch/pigz/files/0001-Do-not-return-non-zero-exit-code-when-warnings-issue.patch @@ -0,0 +1,47 @@ +From 0c967f989d2f1afe1829cf7cf2f6d36846a625ec Mon Sep 17 00:00:00 2001 +From: Mark Adler <madler@alumni.caltech.edu> +Date: Sun, 19 Jan 2014 23:21:58 -0800 +Subject: [PATCH] Do not return non-zero exit code when warnings issued. + +--- + pigz.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/pigz.c b/pigz.c +index 4fefe40..4a16799 100644 +--- a/pigz.c ++++ b/pigz.c +@@ -478,7 +478,6 @@ local struct { + int procs; /* maximum number of compression threads (>= 1) */ + int setdict; /* true to initialize dictionary in each thread */ + size_t block; /* uncompressed input size per thread (>= 32K) */ +- int warned; /* true if a warning has been given */ + + /* saved gzip/zip header data for decompression, testing, and listing */ + time_t stamp; /* time stamp from gzip header */ +@@ -519,7 +518,6 @@ local int complain(char *fmt, ...) + va_end(ap); + putc('\n', stderr); + fflush(stderr); +- g.warned = 1; + } + return 0; + } +@@ -3929,7 +3927,6 @@ int main(int argc, char **argv) + /* initialize globals */ + g.outf = NULL; + g.first = 1; +- g.warned = 0; + g.hname = NULL; + + /* save pointer to program name for error messages */ +@@ -4020,5 +4017,5 @@ int main(int argc, char **argv) + /* done -- release resources, show log */ + new_opts(); + log_dump(); +- return g.warned ? 2 : 0; ++ return 0; + } +-- +1.8.5.3 + diff --git a/app-arch/pigz/files/pigz-2.3-make.patch b/app-arch/pigz/files/pigz-2.3-make.patch new file mode 100644 index 000000000000..f014c7b022ff --- /dev/null +++ b/app-arch/pigz/files/pigz-2.3-make.patch @@ -0,0 +1,25 @@ +From 545a9350f8026f6c9826dd4fa7ab6000d8826d78 Mon Sep 17 00:00:00 2001 +From: Tim Harder <radhermit@gmail.com> +Date: Wed, 6 Mar 2013 15:51:27 -0800 +Subject: [PATCH] Respect LDFLAGS and explicitly link to math library + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 3cc231d..48d1f26 100644 +--- a/Makefile ++++ b/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 +-- +1.8.1.5 + diff --git a/app-arch/pigz/files/pigz-2.3.3-ldflags.patch b/app-arch/pigz/files/pigz-2.3.3-ldflags.patch new file mode 100644 index 000000000000..51c2b81c1fc7 --- /dev/null +++ b/app-arch/pigz/files/pigz-2.3.3-ldflags.patch @@ -0,0 +1,34 @@ +--- pigz-2.3.3/Makefile ++++ pigz-2.3.3/Makefile +@@ -1,11 +1,11 @@ + CC=cc + CFLAGS=-O3 -Wall -Wextra +-LDFLAGS=-lz ++LIBS=-lm -lz + ZOPFLI=zopfli/src/zopfli/ + # use gcc and gmake on Solaris + + pigz: pigz.o yarn.o try.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) $(LDFLAGS) -o pigz $^ -lpthread -lm ++ $(CC) $(LDFLAGS) -o pigz $^ -lpthread $(LIBS) + ln -f pigz unpigz + + pigz.o: pigz.c yarn.h try.h ${ZOPFLI}deflate.h ${ZOPFLI}util.h +@@ -35,7 +35,7 @@ + dev: pigz pigzt pigzn + + pigzt: pigzt.o yarnt.o try.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) $(LDFLAGS) -o pigzt $^ -lpthread -lm ++ $(CC) $(LDFLAGS) -o pigzt $^ -lpthread $(LIBS) + + pigzt.o: pigz.c yarn.h try.h + $(CC) $(CFLAGS) -DDEBUG -g -c -o pigzt.o pigz.c +@@ -44,7 +44,7 @@ + $(CC) $(CFLAGS) -DDEBUG -g -c -o yarnt.o yarn.c + + pigzn: pigzn.o tryn.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) $(LDFLAGS) -o pigzn $^ -lm ++ $(CC) $(LDFLAGS) -o pigzn $^ $(LIBS) + + pigzn.o: pigz.c try.h + $(CC) $(CFLAGS) -DDEBUG -DNOTHREAD -g -c -o pigzn.o pigz.c diff --git a/app-arch/pigz/metadata.xml b/app-arch/pigz/metadata.xml new file mode 100644 index 000000000000..8246c88b8239 --- /dev/null +++ b/app-arch/pigz/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer> + <email>radhermit@gentoo.org</email> + <name>Tim Harder</name> + </maintainer> + <longdescription lang="en"> + A parallel implementation of gzip for modern + multi-processor, multi-core machines. + </longdescription> +</pkgmetadata> diff --git a/app-arch/pigz/pigz-2.3.1-r1.ebuild b/app-arch/pigz/pigz-2.3.1-r1.ebuild new file mode 100644 index 000000000000..f5cf094da2d1 --- /dev/null +++ b/app-arch/pigz/pigz-2.3.1-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit toolchain-funcs flag-o-matic eutils + +DESCRIPTION="A parallel implementation of gzip" +HOMEPAGE="http://www.zlib.net/pigz/" +SRC_URI="http://www.zlib.net/pigz/${P}.tar.gz" + +LICENSE="ZLIB" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~sparc x86 ~amd64-linux ~sparc64-solaris" +IUSE="static symlink test" + +LIB_DEPEND="sys-libs/zlib[static-libs(+)]" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} ) + test? ( app-arch/ncompress )" + +src_prepare() { + epatch "${FILESDIR}"/0001-Do-not-return-non-zero-exit-code-when-warnings-issue.patch +} + +src_compile() { + use static && append-ldflags -static + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" +} + +src_install() { + dobin ${PN} + dosym ${PN} /usr/bin/un${PN} + dodoc README + doman ${PN}.1 + + if use symlink; then + dosym ${PN} /usr/bin/gzip + dosym un${PN} /usr/bin/gunzip + fi +} diff --git a/app-arch/pigz/pigz-2.3.3.ebuild b/app-arch/pigz/pigz-2.3.3.ebuild new file mode 100644 index 000000000000..0588f5a11da6 --- /dev/null +++ b/app-arch/pigz/pigz-2.3.3.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit toolchain-funcs flag-o-matic eutils + +DESCRIPTION="A parallel implementation of gzip" +HOMEPAGE="http://www.zlib.net/pigz/" +SRC_URI="http://www.zlib.net/pigz/${P}.tar.gz" + +LICENSE="ZLIB" +SLOT="0" +KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86 ~amd64-linux ~sparc64-solaris" +IUSE="static symlink test" + +LIB_DEPEND="sys-libs/zlib[static-libs(+)]" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} ) + test? ( app-arch/ncompress )" + +src_prepare() { + epatch "${FILESDIR}"/${P}-ldflags.patch +} + +src_compile() { + use static && append-ldflags -static + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" +} + +src_install() { + dobin ${PN} + dosym ${PN} /usr/bin/un${PN} + dodoc README + doman ${PN}.1 + + if use symlink; then + dosym ${PN} /usr/bin/gzip + dosym un${PN} /usr/bin/gunzip + fi +} |