Mercurial > mxe-octave
diff src/zlib-win32-static.patch @ 879:bdee1b1fe95c
upgrade package zlib
| author | Volker Grabsch <vog@notjusthosting.com> |
|---|---|
| date | Tue, 20 Apr 2010 17:49:41 +0200 |
| parents | |
| children | da255d7986bb |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/zlib-win32-static.patch Tue Apr 20 17:49:41 2010 +0200 @@ -0,0 +1,28 @@ +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' ;;