From c79a2db511dd2938ba264132b6677c9fec4032a6 Mon Sep 17 00:00:00 2001 From: Carlo Landmeter Date: Thu, 11 Aug 2016 15:24:01 +0000 Subject: main/pigz: build fix --- main/pigz/APKBUILD | 13 +++++++++---- main/pigz/reorder-flags.patch | 11 +++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 main/pigz/reorder-flags.patch diff --git a/main/pigz/APKBUILD b/main/pigz/APKBUILD index 4c0cc8a2a4..b00efb5c5b 100644 --- a/main/pigz/APKBUILD +++ b/main/pigz/APKBUILD @@ -12,7 +12,8 @@ depends_dev="" makedepends="zlib-dev" install="" subpackages="$pkgname-doc" -source="http://zlib.net/pigz/pigz-$pkgver.tar.gz" +source="http://zlib.net/pigz/pigz-$pkgver.tar.gz + reorder-flags.patch" _builddir="$srcdir"/pigz-$pkgver prepare() { @@ -27,6 +28,7 @@ prepare() { build() { cd "$_builddir" + export CXXFLAGS="$CXXFLAGS -std=gnu++98" make || return 1 } @@ -40,6 +42,9 @@ package() { install -m644 pigz.1 "$pkgdir"/usr/share/man/man1 } -md5sums="01d7a16cce77929cc1a78aa1bdfb68cb pigz-2.3.3.tar.gz" -sha256sums="4e8b67b432ce7907575a549f3e1cac4709781ba0f6b48afea9f59369846b509c pigz-2.3.3.tar.gz" -sha512sums="6fa5ee1c03b4a8dc4b191acaa337b6f30132503ff413300214e1e6b27dd70590b53334be3fa880916f6ea4498beb8cf7c411a5954fdf188475882c44618c663c pigz-2.3.3.tar.gz" +md5sums="01d7a16cce77929cc1a78aa1bdfb68cb pigz-2.3.3.tar.gz +d3137c812ae4c93aafb5e371b218908d reorder-flags.patch" +sha256sums="4e8b67b432ce7907575a549f3e1cac4709781ba0f6b48afea9f59369846b509c pigz-2.3.3.tar.gz +752355ef26e08338df2494d74b3a223e2e5f564058dae23e3b9276116d2edc7e reorder-flags.patch" +sha512sums="6fa5ee1c03b4a8dc4b191acaa337b6f30132503ff413300214e1e6b27dd70590b53334be3fa880916f6ea4498beb8cf7c411a5954fdf188475882c44618c663c pigz-2.3.3.tar.gz +ebe110d5bcaa2b8de98a9d77497a95ababa7f07ff0b4306f9b6af1a46ffa67014c4436d8f9b4cb9cb8bb1a7bfda2847ff31017d28e84330afd63a2df80899d5c reorder-flags.patch" diff --git a/main/pigz/reorder-flags.patch b/main/pigz/reorder-flags.patch new file mode 100644 index 0000000000..0ce66c2c9a --- /dev/null +++ b/main/pigz/reorder-flags.patch @@ -0,0 +1,11 @@ +--- ./Makefile.orig ++++ ./Makefile +@@ -5,7 +5,7 @@ + # 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) -o pigz $^ -lpthread -lm $(LDFLAGS) + ln -f pigz unpigz + + pigz.o: pigz.c yarn.h try.h ${ZOPFLI}deflate.h ${ZOPFLI}util.h -- cgit v1.2.3