Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | This patch avoids underlinking issues since we pass -lz via LDFLAGS but it appears |
| 2 | before pigz.o which needs symbols from libz however due to order linker happily discards libz |
| 3 | |
| 4 | Upstream-Status: Pending |
| 5 | |
| 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 7 | |
| 8 | Index: pigz-2.3.3/Makefile |
| 9 | =================================================================== |
| 10 | --- pigz-2.3.3.orig/Makefile 2015-01-19 20:12:31.000000000 -0800 |
| 11 | +++ pigz-2.3.3/Makefile 2015-01-28 09:11:50.266669184 -0800 |
| 12 | @@ -5,7 +5,7 @@ |
| 13 | # use gcc and gmake on Solaris |
| 14 | |
| 15 | 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 |
| 16 | - $(CC) $(LDFLAGS) -o pigz $^ -lpthread -lm |
| 17 | + $(CC) -o pigz $^ $(LDFLAGS) -lz -lpthread -lm |
| 18 | ln -f pigz unpigz |
| 19 | |
| 20 | pigz.o: pigz.c yarn.h try.h ${ZOPFLI}deflate.h ${ZOPFLI}util.h |
| 21 | @@ -35,7 +35,7 @@ |
| 22 | dev: pigz pigzt pigzn |
| 23 | |
| 24 | 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 |
| 25 | - $(CC) $(LDFLAGS) -o pigzt $^ -lpthread -lm |
| 26 | + $(CC) -o pigzt $^ $(LDFLAGS) -lz -lpthread -lm |
| 27 | |
| 28 | pigzt.o: pigz.c yarn.h try.h |
| 29 | $(CC) $(CFLAGS) -DDEBUG -g -c -o pigzt.o pigz.c |
| 30 | @@ -44,7 +44,7 @@ |
| 31 | $(CC) $(CFLAGS) -DDEBUG -g -c -o yarnt.o yarn.c |
| 32 | |
| 33 | 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 |
| 34 | - $(CC) $(LDFLAGS) -o pigzn $^ -lm |
| 35 | + $(CC) -o pigzn $^ $(LDFLAGS) -lz -lm |
| 36 | |
| 37 | pigzn.o: pigz.c try.h |
| 38 | $(CC) $(CFLAGS) -DDEBUG -DNOTHREAD -g -c -o pigzn.o pigz.c |