Commit 7b462167 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

zlib: bump version



Patch is now upstream.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 14c24428
Loading
Loading
Loading
Loading
+0 −24
Original line number Diff line number Diff line
[PATCH] fix make install for static builds

Only try to install shared lib if we've built one.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Makefile.in |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: zlib-1.2.5/Makefile.in
===================================================================
--- zlib-1.2.5.orig/Makefile.in
+++ zlib-1.2.5/Makefile.in
@@ -168,7 +168,9 @@ install-libs: $(LIBS)
 	-@if [ ! -d $(DESTDIR)$(man3dir)      ]; then mkdir -p $(DESTDIR)$(man3dir); fi
 	-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
 	cp $(STATICLIB) $(DESTDIR)$(libdir)
-	cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
+	if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
+	  cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
+	fi
 	cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB)
 	-@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
 	-@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
+5 −4
Original line number Diff line number Diff line
@@ -3,9 +3,10 @@
# zlib
#
#############################################################
ZLIB_VERSION:=1.2.5
ZLIB_SOURCE:=zlib-$(ZLIB_VERSION).tar.bz2
ZLIB_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng

ZLIB_VERSION = 1.2.6
ZLIB_SOURCE =zlib-$(ZLIB_VERSION).tar.bz2
ZLIB_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
ZLIB_INSTALL_STAGING = YES

ifeq ($(BR2_PREFER_STATIC_LIB),y)