Mercurial > mxe-octave
changeset 4332:23b64041b678
zlib: update to 1.2.11
* src/zlib.mk: update version, checksum
* src/zlib-1-win32-static.patch: update from mxe.cc
| author | John D |
|---|---|
| date | Mon, 16 Jan 2017 08:28:00 -0500 |
| parents | bd6b7fc2b791 |
| children | 3a97edaa931e |
| files | src/zlib-1-win32-static.patch src/zlib.mk |
| diffstat | 2 files changed, 35 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/src/zlib-1-win32-static.patch Mon Jan 16 08:22:08 2017 -0500 +++ b/src/zlib-1-win32-static.patch Mon Jan 16 08:28:00 2017 -0500 @@ -1,12 +1,35 @@ -This file is part of MXE. -See index.html for further information. +This file is part of MXE. See LICENSE.md for licensing information. -Contains ad hoc patches for cross building. +From 2de67e2eedc9bd458c1e5170ae43d815b466f012 Mon Sep 17 00:00:00 2001 +From: Volker Grabsch <vog@notjusthosting.com> +Date: Sun, 15 Jan 2017 16:10:19 +0100 +Subject: [PATCH] build fix for mxe static + -diff -urN a/configure b/configure ---- a/configure 2013-03-24 06:30:09.000000000 +0100 -+++ b/configure 2013-04-29 12:19:25.526304670 +0200 -@@ -191,10 +191,7 @@ +diff --git a/Makefile.in b/Makefile.in +index 1852192..c88f5b5 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -310,12 +310,12 @@ install-libs: $(LIBS) + -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi + -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi + rm -f $(DESTDIR)$(libdir)/$(STATICLIB) +- cp $(STATICLIB) $(DESTDIR)$(libdir) ++ [ -z '$(STATICLIB)' ] || cp $(STATICLIB) $(DESTDIR)$(libdir) + chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB) + -@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1 + -@if test -n "$(SHAREDLIBV)"; then \ + rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \ +- cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \ ++ [ -z '$(SHAREDLIBV)' ] || cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \ + echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \ + chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \ + echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \ +diff --git a/configure b/configure +index e974d1f..f023947 100755 +--- a/configure ++++ b/configure +@@ -215,10 +215,7 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then CYGWIN* | Cygwin* | cygwin* | OS/2*) EXE='.exe' ;; MINGW* | mingw*) @@ -17,20 +40,6 @@ LDSHARED=${LDSHARED-"$cc -shared"} LDSHAREDLIBC="" EXE='.exe' ;; -diff -urN a/Makefile.in b/Makefile.in ---- a/Makefile.in 2013-04-29 00:57:11.000000000 +0200 -+++ b/Makefile.in 2013-04-29 12:16:08.631379491 +0200 -@@ -190,11 +190,11 @@ - -@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi - -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi - -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi -- cp $(STATICLIB) $(DESTDIR)$(libdir) -+ [ -z '$(STATICLIB)' ] || cp $(STATICLIB) $(DESTDIR)$(libdir) - chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB) - -@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1 - -@if test -n "$(SHAREDLIBV)"; then \ -- cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \ -+ [ -z '$(SHAREDLIBV)' ] || cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \ - echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \ - chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \ - echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \ +-- +2.9.3 +
--- a/src/zlib.mk Mon Jan 16 08:22:08 2017 -0500 +++ b/src/zlib.mk Mon Jan 16 08:28:00 2017 -0500 @@ -3,8 +3,8 @@ PKG := zlib $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.8 -$(PKG)_CHECKSUM := b598beb7acc96347cbd1020b71aef7871d374677 +$(PKG)_VERSION := 1.2.11 +$(PKG)_CHECKSUM := e1cb0d5c92da8e9a8c2635dfa249c341dfd00322 $(PKG)_SUBDIR := zlib-$($(PKG)_VERSION) $(PKG)_FILE := zlib-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://zlib.net/$($(PKG)_FILE)