From 7b462167eefb25138669c9ed632cd9ed16d5550f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 13 Feb 2012 11:25:18 +0100 Subject: zlib: bump version Patch is now upstream. Signed-off-by: Peter Korsgaard --- package/zlib/zlib-1.2.5-fix-static-install.patch | 24 ------------------------ package/zlib/zlib.mk | 9 +++++---- 2 files changed, 5 insertions(+), 28 deletions(-) delete mode 100644 package/zlib/zlib-1.2.5-fix-static-install.patch diff --git a/package/zlib/zlib-1.2.5-fix-static-install.patch b/package/zlib/zlib-1.2.5-fix-static-install.patch deleted file mode 100644 index 0a885f742..000000000 --- a/package/zlib/zlib-1.2.5-fix-static-install.patch +++ /dev/null @@ -1,24 +0,0 @@ -[PATCH] fix make install for static builds - -Only try to install shared lib if we've built one. - -Signed-off-by: Peter Korsgaard ---- - 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 \ diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk index fbe923e69..eca98b876 100644 --- a/package/zlib/zlib.mk +++ b/package/zlib/zlib.mk @@ -3,10 +3,11 @@ # 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_INSTALL_STAGING=YES + +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) ZLIB_PIC := -- cgit v1.2.3