Commit 1801dbcc authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Zlib: update to 1.2.6

parent 0ea07fba
83ce467787903b7e90ece203aaea0be42174b9cf4a9aa16fe3f72925a4993b549d50154dec4cc76b4cb1aa0b7b966118772aca3d73efa0601167256ff7ce7a12 zlib-1.2.5.tar.gz
f812ab3049fc2920a8da4649f6e60340ac365d58a0e76ace5219426aeb0759c0a474cfb2b9902cd0471158fa32a4d2c35692309d266e66013444bdced8ed00d9 zlib-1.2.6.tar.gz
# ZLIB
ZLIB_VERSION := 1.2.5
ZLIB_VERSION := 1.2.6
ZLIB_URL := $(SF)/libpng/zlib-$(ZLIB_VERSION).tar.gz
PKGS += zlib
......@@ -15,7 +15,6 @@ $(TARBALLS)/zlib-$(ZLIB_VERSION).tar.gz:
zlib: zlib-$(ZLIB_VERSION).tar.gz .sum-zlib
$(UNPACK)
$(APPLY) $(SRC)/zlib/zlib-wince.patch
$(APPLY) $(SRC)/zlib/zlib-static.patch
$(MOVE)
.zlib: zlib
......
--- zlib/Makefile.in 2010-04-20 06:12:21.000000000 +0200
+++ zlib.new/Makefile.in 2010-06-08 14:02:43.000000000 +0200
@@ -168,7 +168,7 @@
-@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)
+ cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir) || true >/dev/null 2>&1
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 \
--- zlib/zutil.h 2010-04-18 21:29:24.000000000 +0200
+++ zlib.new/zutil.h 2010-06-08 13:53:03.000000000 +0200
@@ -153,6 +153,10 @@
--- zlib-1.2.6/zutil.h.orig 2011-12-18 19:39:45.000000000 +0100
+++ zlib-1.2.6/zutil.h 2012-04-30 23:29:05.787740053 +0200
@@ -161,6 +161,10 @@
# endif
#endif
......@@ -8,6 +8,6 @@
+# define fdopen(fd,mode) NULL /* No fdopen() */
+#endif
+
#if defined(__BORLANDC__)
#if defined(__BORLANDC__) && !defined(MSDOS)
#pragma warn -8004
#pragma warn -8008
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment