./0000775000175000017500000000000012511411356011434 5ustar nielsenrnielsenr./Makefile-runtests.patch0000664000175000017500000000214512511411356016061 0ustar nielsenrnielsenrAdd 'ptest' target to Makefile, to run tests without checking dependencies. Signed-off-by: Anders Roxell Upstream-Status: Pending --- diff -uNr a/Makefile.in b/Makefile.in --- a/Makefile.in 2013-06-10 13:48:14.321959162 +0200 +++ b/Makefile.in 2013-06-10 13:49:36.686476448 +0200 @@ -83,6 +83,9 @@ test: all teststatic testshared teststatic: static + @make runteststatic + +runteststatic: @TMPST=tmpst_$$; \ if echo hello world | ./minigzip | ./minigzip -d && ./example $$TMPST ; then \ echo ' *** zlib test OK ***'; \ @@ -92,6 +95,9 @@ rm -f $$TMPST testshared: shared + @make runtestshared + +runtestshared: @LD_LIBRARY_PATH=`pwd`:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ LD_LIBRARYN32_PATH=`pwd`:$(LD_LIBRARYN32_PATH) ; export LD_LIBRARYN32_PATH; \ DYLD_LIBRARY_PATH=`pwd`:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \ @@ -105,6 +111,9 @@ rm -f $$TMPSH test64: all64 + @make runtestall64 + +runtestall64: @TMP64=tmp64_$$; \ if echo hello world | ./minigzip64 | ./minigzip64 -d && ./example64 $$TMP64; then \ echo ' *** zlib 64-bit test OK ***'; \ ./ldflags-tests.patch0000664000175000017500000000265012511411356015234 0ustar nielsenrnielsenrObey LDFLAGS for tests Signed-off-by: Christopher Larson Upstream-status: Pending --- zlib-1.2.8.orig/Makefile.in +++ zlib-1.2.8/Makefile.in @@ -26,7 +26,7 @@ CFLAGS=-O SFLAGS=-O LDFLAGS= -TEST_LDFLAGS=-L. libz.a +TEST_LDFLAGS=-L. $(LDFLAGS) LDSHARED=$(CC) CPP=$(CC) -E @@ -176,22 +176,22 @@ placebo $(SHAREDLIBV): $(PIC_OBJS) libz. -@rmdir objs example$(EXE): example.o $(STATICLIB) - $(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS) + $(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS) $(STATICLIB) minigzip$(EXE): minigzip.o $(STATICLIB) - $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS) + $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS) $(STATICLIB) examplesh$(EXE): example.o $(SHAREDLIBV) - $(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV) + $(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS) $(SHAREDLIBV) minigzipsh$(EXE): minigzip.o $(SHAREDLIBV) - $(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV) + $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS) $(SHAREDLIBV) example64$(EXE): example64.o $(STATICLIB) - $(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS) + $(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS) $(STATICLIB) minigzip64$(EXE): minigzip64.o $(STATICLIB) - $(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS) + $(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS) $(STATICLIB) install-libs: $(LIBS) -@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi ./remove.ldconfig.call.patch0000664000175000017500000000157312511411356016456 0ustar nielsenrnielsenr When /etc/ld.so.cache is writeable by user running bitbake then it creates invalid cache (in my case libstdc++.so cannot be found after building zlib(-native) and I have to call touch */libstdc++.so && /sbin/ldconfig to fix it. So remove ldconfig call from make install-libs Upstream-Status: Inappropriate [disable feature] diff -uNr zlib-1.2.6.orig/Makefile.in zlib-1.2.6/Makefile.in --- zlib-1.2.6.orig/Makefile.in 2012-01-28 23:48:50.000000000 +0100 +++ zlib-1.2.6/Makefile.in 2012-02-13 15:38:20.577700723 +0100 @@ -199,7 +199,6 @@ rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \ ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \ ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \ - ($(LDCONFIG) || true) >/dev/null 2>&1; \ fi cp zlib.3 $(DESTDIR)$(man3dir) chmod 644 $(DESTDIR)$(man3dir)/zlib.3 ./run-ptest0000664000175000017500000000023512511411356013320 0ustar nielsenrnielsenr#!/bin/sh make -k runteststatic runtestshared | sed -r -e 's/^(\s+\*+ (.+?) test OK \*+)/\1\nPASS: \2/' -e 's/^(\s+\*+ (.+?) test FAILED \*+)/\1\nFAIL: \2/'