mxe/src/zlib-1-win32-static.patch

36 lines
1.6 KiB
Diff
Raw Normal View History

This file is part of MXE. See LICENSE.md for licensing information.
2012-01-29 20:53:13 +00:00
Contains ad hoc patches for cross building.
2013-04-29 11:24:19 +01:00
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 @@
2010-04-20 16:49:41 +01:00
-@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)
2012-01-29 20:53:13 +00:00
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)"; \