Mercurial > mxe-octave
annotate src/zlib-1-win32-static.patch @ 4039:1c72016826aa
of-fl-core: update patch for --enable-64
* src/of-fl-core-1-fixes.patch: update patch
author | John Donoghue |
---|---|
date | Wed, 30 Sep 2015 14:11:45 -0400 |
parents | 50a4de42ba1e |
children | 23b64041b678 |
rev | line source |
---|---|
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2227
diff
changeset
|
1 This file is part of MXE. |
2353
99516e73b368
Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents:
2333
diff
changeset
|
2 See index.html for further information. |
972
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
3 |
2227 | 4 Contains ad hoc patches for cross building. |
5 | |
3242
50a4de42ba1e
Update zlib to 1.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
2502
diff
changeset
|
6 diff -urN a/configure b/configure |
50a4de42ba1e
Update zlib to 1.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
2502
diff
changeset
|
7 --- a/configure 2013-03-24 06:30:09.000000000 +0100 |
50a4de42ba1e
Update zlib to 1.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
2502
diff
changeset
|
8 +++ b/configure 2013-04-29 12:19:25.526304670 +0200 |
50a4de42ba1e
Update zlib to 1.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
2502
diff
changeset
|
9 @@ -191,10 +191,7 @@ |
50a4de42ba1e
Update zlib to 1.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
2502
diff
changeset
|
10 CYGWIN* | Cygwin* | cygwin* | OS/2*) |
50a4de42ba1e
Update zlib to 1.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
2502
diff
changeset
|
11 EXE='.exe' ;; |
50a4de42ba1e
Update zlib to 1.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
2502
diff
changeset
|
12 MINGW* | mingw*) |
50a4de42ba1e
Update zlib to 1.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
2502
diff
changeset
|
13 -# temporary bypass |
50a4de42ba1e
Update zlib to 1.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
2502
diff
changeset
|
14 rm -f $test.[co] $test $test$shared_ext |
50a4de42ba1e
Update zlib to 1.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
2502
diff
changeset
|
15 - echo "Please use win32/Makefile.gcc instead." | tee -a configure.log |
50a4de42ba1e
Update zlib to 1.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
2502
diff
changeset
|
16 - leave 1 |
50a4de42ba1e
Update zlib to 1.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
2502
diff
changeset
|
17 LDSHARED=${LDSHARED-"$cc -shared"} |
50a4de42ba1e
Update zlib to 1.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
2502
diff
changeset
|
18 LDSHAREDLIBC="" |
50a4de42ba1e
Update zlib to 1.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
2502
diff
changeset
|
19 EXE='.exe' ;; |
50a4de42ba1e
Update zlib to 1.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
2502
diff
changeset
|
20 diff -urN a/Makefile.in b/Makefile.in |
50a4de42ba1e
Update zlib to 1.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
2502
diff
changeset
|
21 --- a/Makefile.in 2013-04-29 00:57:11.000000000 +0200 |
50a4de42ba1e
Update zlib to 1.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
2502
diff
changeset
|
22 +++ b/Makefile.in 2013-04-29 12:16:08.631379491 +0200 |
50a4de42ba1e
Update zlib to 1.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
2502
diff
changeset
|
23 @@ -190,11 +190,11 @@ |
972
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
24 -@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
25 -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
26 -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
27 - cp $(STATICLIB) $(DESTDIR)$(libdir) |
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
28 + [ -z '$(STATICLIB)' ] || cp $(STATICLIB) $(DESTDIR)$(libdir) |
2227 | 29 chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB) |
30 -@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1 | |
31 -@if test -n "$(SHAREDLIBV)"; then \ | |
32 - cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \ | |
33 + [ -z '$(SHAREDLIBV)' ] || cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \ | |
34 echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \ | |
35 chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \ | |
36 echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \ |