NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zlib: bump version

Browse Source 
Patch is now upstream.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2012-02-13 11:25:18 +01:00
parent 14c2442858
commit 7b462167ee
2 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
package/zlib/zlib-1.2.5-fix-static-install.patch
View File

@ -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 <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 \

9
package/zlib/zlib.mk
View File

@ -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 :=