Mercurial > mxe-octave

annotate src/zlib-1-win32-static.patch @ 5579:2734b3818171

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid double-free with librsb (bug #58957). * src/librsb.mk: Add work-around to avoid double-free (provided by Michele Martone). * src/mingw-of-sparsersb-1-no-render.patch: Remove patch. * dist-files.mk: Remove file from list.
author Markus Mützel <markus.muetzel@gmx.de>
date Mon, 02 Nov 2020 08:55:18 +0100
parents 23b64041b678
children 24395c2d32fa
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4332
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
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
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
3 From 2de67e2eedc9bd458c1e5170ae43d815b466f012 Mon Sep 17 00:00:00 2001
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
4 From: Volker Grabsch <vog@notjusthosting.com>
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
5 Date: Sun, 15 Jan 2017 16:10:19 +0100
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
6 Subject: [PATCH] build fix for mxe static
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
7
2227
f3d0fe4cc136 update package zlib
Mark Brand <mabrand@mabrand.nl>
parents: 972
diff changeset
8
4332
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
9 diff --git a/Makefile.in b/Makefile.in
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
10 index 1852192..c88f5b5 100644
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
11 --- a/Makefile.in
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
12 +++ b/Makefile.in
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
13 @@ -310,12 +310,12 @@ install-libs: $(LIBS)
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
14 -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
15 -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
16 rm -f $(DESTDIR)$(libdir)/$(STATICLIB)
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
17 - cp $(STATICLIB) $(DESTDIR)$(libdir)
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
18 + [ -z '$(STATICLIB)' ] || cp $(STATICLIB) $(DESTDIR)$(libdir)
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
19 chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
20 -@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
21 -@if test -n "$(SHAREDLIBV)"; then \
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
22 rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
23 - cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
24 + [ -z '$(SHAREDLIBV)' ] || cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
25 echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
26 chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
27 echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
28 diff --git a/configure b/configure
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
29 index e974d1f..f023947 100755
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
30 --- a/configure
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
31 +++ b/configure
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
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
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
43 --
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
44 2.9.3
23b64041b678 zlib: update to 1.2.11
John D
parents: 3242
diff changeset
45