summaryrefslogtreecommitdiffstats
path: root/src/zlib-1-win32-static.patch
diff options
context:
space:
mode:
authorVolker Grabsch <vog@notjusthosting.com>2010-05-14 17:59:46 (GMT)
committerVolker Grabsch <vog@notjusthosting.com>2010-05-14 17:59:46 (GMT)
commit6f45b35ff46fcc339715d0360a9a998e0ef7cb2b (patch)
treef482f0f61d65733f3aed489715f9b5b44bb6c781 /src/zlib-1-win32-static.patch
parent40f4cf1fbfe702ed8fce45868f88f4b52f3ae227 (diff)
downloadmxe-6f45b35ff46fcc339715d0360a9a998e0ef7cb2b.zip
mxe-6f45b35ff46fcc339715d0360a9a998e0ef7cb2b.tar.gz
mxe-6f45b35ff46fcc339715d0360a9a998e0ef7cb2b.tar.bz2
improved naming of patch files
Diffstat (limited to 'src/zlib-1-win32-static.patch')
-rw-r--r--src/zlib-1-win32-static.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/src/zlib-1-win32-static.patch b/src/zlib-1-win32-static.patch
new file mode 100644
index 0000000..c88feb2
--- /dev/null
+++ b/src/zlib-1-win32-static.patch
@@ -0,0 +1,31 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+diff -r 5a13d390f989 Makefile.in
+--- a/Makefile.in Tue Apr 20 14:59:46 2010 +0200
++++ b/Makefile.in Tue Apr 20 17:46:22 2010 +0200
+@@ -167,8 +167,8 @@
+ -@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)
+- cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
++ [ -z '$(STATICLIB)' ] || cp $(STATICLIB) $(DESTDIR)$(libdir)
++ [ -z '$(SHAREDLIBV)' ] || cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
+ 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 -r 5a13d390f989 configure
+--- a/configure Tue Apr 20 14:59:46 2010 +0200
++++ b/configure Tue Apr 20 17:46:22 2010 +0200
+@@ -122,10 +122,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."
+- exit 1
+ LDSHARED=${LDSHARED-"$cc -shared"}
+ LDSHAREDLIBC=""
+ EXE='.exe' ;;