Mercurial > mxe-octave
annotate src/zlib-1-win32-static.patch @ 6001:88762923aa9a release
octave-launch: Attach to console of parent process if applicable.
* installer-files/octave-launch.c: If parent process has a console, attach to
it.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Sun, 05 Dec 2021 18:26:51 +0100 |
parents | 23b64041b678 |
children | 24395c2d32fa |
rev | line source |
---|---|
4332 | 1 This file is part of MXE. See LICENSE.md for licensing information. |
972
e5d55b815b89
improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff
changeset
|
2 |
4332 | 3 From 2de67e2eedc9bd458c1e5170ae43d815b466f012 Mon Sep 17 00:00:00 2001 |
4 From: Volker Grabsch <vog@notjusthosting.com> | |
5 Date: Sun, 15 Jan 2017 16:10:19 +0100 | |
6 Subject: [PATCH] build fix for mxe static | |
7 | |
2227 | 8 |
4332 | 9 diff --git a/Makefile.in b/Makefile.in |
10 index 1852192..c88f5b5 100644 | |
11 --- a/Makefile.in | |
12 +++ b/Makefile.in | |
13 @@ -310,12 +310,12 @@ install-libs: $(LIBS) | |
14 -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi | |
15 -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi | |
16 rm -f $(DESTDIR)$(libdir)/$(STATICLIB) | |
17 - cp $(STATICLIB) $(DESTDIR)$(libdir) | |
18 + [ -z '$(STATICLIB)' ] || cp $(STATICLIB) $(DESTDIR)$(libdir) | |
19 chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB) | |
20 -@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1 | |
21 -@if test -n "$(SHAREDLIBV)"; then \ | |
22 rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \ | |
23 - cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \ | |
24 + [ -z '$(SHAREDLIBV)' ] || cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \ | |
25 echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \ | |
26 chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \ | |
27 echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \ | |
28 diff --git a/configure b/configure | |
29 index e974d1f..f023947 100755 | |
30 --- a/configure | |
31 +++ b/configure | |
32 @@ -215,10 +215,7 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then | |
3242
50a4de42ba1e
Update zlib to 1.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
2502
diff
changeset
|
33 CYGWIN* | Cygwin* | cygwin* | OS/2*) |
50a4de42ba1e
Update zlib to 1.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
2502
diff
changeset
|
34 EXE='.exe' ;; |
50a4de42ba1e
Update zlib to 1.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
2502
diff
changeset
|
35 MINGW* | mingw*) |
50a4de42ba1e
Update zlib to 1.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
2502
diff
changeset
|
36 -# temporary bypass |
50a4de42ba1e
Update zlib to 1.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
2502
diff
changeset
|
37 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
|
38 - 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
|
39 - leave 1 |
50a4de42ba1e
Update zlib to 1.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
2502
diff
changeset
|
40 LDSHARED=${LDSHARED-"$cc -shared"} |
50a4de42ba1e
Update zlib to 1.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
2502
diff
changeset
|
41 LDSHAREDLIBC="" |
50a4de42ba1e
Update zlib to 1.2.8
John Donoghue <john.donoghue@ieee.org>
parents:
2502
diff
changeset
|
42 EXE='.exe' ;; |
4332 | 43 -- |
44 2.9.3 | |
45 |