Mercurial > mxe-octave

annotate src/curl-1-fixes.patch @ 6497:c5a38140ad2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
curl: update to v7.86.0 * src/curl.mk: update version, checksum * src/curl-1-fixes.patch: new file * dist-files.mk: add ref to new file
author John Donoghue <john.donoghue@ieee.org>
date Mon, 31 Oct 2022 14:18:41 -0400
parents
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6497
c5a38140ad2a curl: update to v7.86.0
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
1 This file is part of MXE. See LICENSE.md for licensing information.
c5a38140ad2a curl: update to v7.86.0
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
2
c5a38140ad2a curl: update to v7.86.0
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
3 Contains ad hoc patches for cross building.
c5a38140ad2a curl: update to v7.86.0
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
4
c5a38140ad2a curl: update to v7.86.0
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
5 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
c5a38140ad2a curl: update to v7.86.0
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
6 From: Tony Theodore <tonyt@logyst.com>
c5a38140ad2a curl: update to v7.86.0
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
7 Date: Mon, 31 Oct 2022 18:57:29 +1100
c5a38140ad2a curl: update to v7.86.0
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
8 Subject: [PATCH 1/1] fix shared build with windres
c5a38140ad2a curl: update to v7.86.0
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
9
c5a38140ad2a curl: update to v7.86.0
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
10 taken from:
c5a38140ad2a curl: update to v7.86.0
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
11 https://github.com/curl/curl/commit/b7260c4fda95196b2fa16f32b5913f25323e5098
c5a38140ad2a curl: update to v7.86.0
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
12
c5a38140ad2a curl: update to v7.86.0
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
13 diff --git a/src/Makefile.in b/src/Makefile.in
c5a38140ad2a curl: update to v7.86.0
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
14 index 1111111..2222222 100644
c5a38140ad2a curl: update to v7.86.0
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
15 --- a/src/Makefile.in
c5a38140ad2a curl: update to v7.86.0
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
16 +++ b/src/Makefile.in
c5a38140ad2a curl: update to v7.86.0
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
17 @@ -2000,7 +2000,7 @@ listhelp:
c5a38140ad2a curl: update to v7.86.0
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
18
c5a38140ad2a curl: update to v7.86.0
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
19 # Warning is "normal": libtool: error: ignoring unknown tag RC
c5a38140ad2a curl: update to v7.86.0
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
20 @OS_WINDOWS_TRUE@.rc.o:
c5a38140ad2a curl: update to v7.86.0
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
21 -@OS_WINDOWS_TRUE@ $(LIBTOOL) --tag=RC --mode=compile $(RC) -I$(top_srcdir)/include -DCURL_EMBED_MANIFEST $(RCFLAGS) -i $< -o $@
c5a38140ad2a curl: update to v7.86.0
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
22 +@OS_WINDOWS_TRUE@ $(RC) -I$(top_srcdir)/include -DCURL_EMBED_MANIFEST $(RCFLAGS) -i $< -o $@
c5a38140ad2a curl: update to v7.86.0
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
23
c5a38140ad2a curl: update to v7.86.0
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
24 # Tell versions [3.59,3.63) of GNU make to not export all variables.
c5a38140ad2a curl: update to v7.86.0
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
25 # Otherwise a system limit (for SysV at least) may be exceeded.