diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2013-04-29 10:24:19 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2013-04-29 10:24:19 (GMT) |
| commit | 80e82e49a6277268cd90fceeba9ee13b0cf3d51e (patch) | |
| tree | ab9431f96623bc2df2290ec067a4a4a910ef5b1c /src | |
| parent | 8471e4878440d71eeba065b4ec741598270b82be (diff) | |
| download | mxe-80e82e49a6277268cd90fceeba9ee13b0cf3d51e.zip mxe-80e82e49a6277268cd90fceeba9ee13b0cf3d51e.tar.gz mxe-80e82e49a6277268cd90fceeba9ee13b0cf3d51e.tar.bz2 | |
update package zlib
Diffstat (limited to 'src')
| -rw-r--r-- | src/zlib-1-win32-static.patch | 47 | ||||
| -rw-r--r-- | src/zlib.mk | 4 |
2 files changed, 20 insertions, 31 deletions
diff --git a/src/zlib-1-win32-static.patch b/src/zlib-1-win32-static.patch index 74c1087..d5ac5c8 100644 --- a/src/zlib-1-win32-static.patch +++ b/src/zlib-1-win32-static.patch @@ -3,17 +3,24 @@ See index.html for further information. Contains ad hoc patches for cross building. -From dfe5701faf3683be7ea53885c58d4bd3499c4d1c Mon Sep 17 00:00:00 2001 -From: MXE -Date: Sun, 29 Jan 2012 21:51:03 +0100 -Subject: [PATCH] workarounds for MXE - - -diff --git a/Makefile.in b/Makefile.in -index ea430bf..f2573e7 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -190,11 +190,11 @@ install-libs: $(LIBS) +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 @@ + CYGWIN* | Cygwin* | cygwin* | OS/2*) + EXE='.exe' ;; + MINGW* | mingw*) +-# temporary bypass + rm -f $test.[co] $test $test$shared_ext +- echo "Please use win32/Makefile.gcc instead." | tee -a configure.log +- leave 1 + 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 @@ -27,21 +34,3 @@ index ea430bf..f2573e7 100644 echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \ chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \ echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \ -diff --git a/configure b/configure -index 780317c..6e6a033 100755 ---- a/configure -+++ b/configure -@@ -205,10 +205,7 @@ if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) >> configure.log 2>&1; then - CYGWIN* | Cygwin* | cygwin* | OS/2*) - EXE='.exe' ;; - MINGW* | mingw*) --# temporary bypass - rm -f $test.[co] $test $test$shared_ext -- echo "Please use win32/Makefile.gcc instead." | tee -a configure.log -- exit 1 - LDSHARED=${LDSHARED-"$cc -shared"} - LDSHAREDLIBC="" - EXE='.exe' ;; --- -1.7.8.3 - diff --git a/src/zlib.mk b/src/zlib.mk index bb75acc..767c18a 100644 --- a/src/zlib.mk +++ b/src/zlib.mk @@ -3,9 +3,9 @@ PKG := zlib $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 858818fe6d358ec682d54ac5e106a2dd62628e7f +$(PKG)_CHECKSUM := b598beb7acc96347cbd1020b71aef7871d374677 $(PKG)_SUBDIR := zlib-$($(PKG)_VERSION) -$(PKG)_FILE := zlib-$($(PKG)_VERSION).tar.bz2 +$(PKG)_FILE := zlib-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://zlib.net/$($(PKG)_FILE) $(PKG)_URL_2 := http://$(SOURCEFORGE_MIRROR)/project/libpng/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc |