Mercurial > mxe-octave

comparison src/zlib-1-win32-static.patch @ 3242:50a4de42ba1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update zlib to 1.2.8 * src/zlib.mk: update checksum and zlibfile type to .xz. * index.html: update zlib-version to 1.2.8 * src/zlib-1-win32-static.patch: update patch to latest mxe patch.
author John Donoghue <john.donoghue@ieee.org>
date Fri, 30 Aug 2013 20:41:40 -0400
parents 72b584e79721
children 23b64041b678
comparison
equal deleted inserted replaced
3241:537ca0c3354d 3242:50a4de42ba1e
1 This file is part of MXE. 1 This file is part of MXE.
2 See index.html for further information. 2 See index.html for further information.
3 3
4 Contains ad hoc patches for cross building. 4 Contains ad hoc patches for cross building.
5 5
6 From dfe5701faf3683be7ea53885c58d4bd3499c4d1c Mon Sep 17 00:00:00 2001 6 diff -urN a/configure b/configure
7 From: MXE 7 --- a/configure 2013-03-24 06:30:09.000000000 +0100
8 Date: Sun, 29 Jan 2012 21:51:03 +0100 8 +++ b/configure 2013-04-29 12:19:25.526304670 +0200
9 Subject: [PATCH] workarounds for MXE 9 @@ -191,10 +191,7 @@
10 10 CYGWIN* | Cygwin* | cygwin* | OS/2*)
11 11 EXE='.exe' ;;
12 diff --git a/Makefile.in b/Makefile.in 12 MINGW* | mingw*)
13 index ea430bf..f2573e7 100644 13 -# temporary bypass
14 --- a/Makefile.in 14 rm -f $test.[co] $test $test$shared_ext
15 +++ b/Makefile.in 15 - echo "Please use win32/Makefile.gcc instead." | tee -a configure.log
16 @@ -190,11 +190,11 @@ install-libs: $(LIBS) 16 - leave 1
17 LDSHARED=${LDSHARED-"$cc -shared"}
18 LDSHAREDLIBC=""
19 EXE='.exe' ;;
20 diff -urN a/Makefile.in b/Makefile.in
21 --- a/Makefile.in 2013-04-29 00:57:11.000000000 +0200
22 +++ b/Makefile.in 2013-04-29 12:16:08.631379491 +0200
23 @@ -190,11 +190,11 @@
17 -@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi 24 -@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
18 -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi 25 -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi
19 -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi 26 -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
20 - cp $(STATICLIB) $(DESTDIR)$(libdir) 27 - cp $(STATICLIB) $(DESTDIR)$(libdir)
21 + [ -z '$(STATICLIB)' ] || cp $(STATICLIB) $(DESTDIR)$(libdir) 28 + [ -z '$(STATICLIB)' ] || cp $(STATICLIB) $(DESTDIR)$(libdir)
25 - cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \ 32 - cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
26 + [ -z '$(SHAREDLIBV)' ] || cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \ 33 + [ -z '$(SHAREDLIBV)' ] || cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
27 echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \ 34 echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \
28 chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \ 35 chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
29 echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \ 36 echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \
30 diff --git a/configure b/configure
31 index 780317c..6e6a033 100755
32 --- a/configure
33 +++ b/configure
34 @@ -205,10 +205,7 @@ if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) >> configure.log 2>&1; then
35 CYGWIN* | Cygwin* | cygwin* | OS/2*)
36 EXE='.exe' ;;
37 MINGW* | mingw*)
38 -# temporary bypass
39 rm -f $test.[co] $test $test$shared_ext
40 - echo "Please use win32/Makefile.gcc instead." | tee -a configure.log
41 - exit 1
42 LDSHARED=${LDSHARED-"$cc -shared"}
43 LDSHAREDLIBC=""
44 EXE='.exe' ;;
45 --
46 1.7.8.3
47