Mercurial > mxe-octave
diff src/curl-1-fixes.patch @ 6497:c5a38140ad2a
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 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/curl-1-fixes.patch Mon Oct 31 14:18:41 2022 -0400 @@ -0,0 +1,25 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore <tonyt@logyst.com> +Date: Mon, 31 Oct 2022 18:57:29 +1100 +Subject: [PATCH 1/1] fix shared build with windres + +taken from: +https://github.com/curl/curl/commit/b7260c4fda95196b2fa16f32b5913f25323e5098 + +diff --git a/src/Makefile.in b/src/Makefile.in +index 1111111..2222222 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -2000,7 +2000,7 @@ listhelp: + + # Warning is "normal": libtool: error: ignoring unknown tag RC + @OS_WINDOWS_TRUE@.rc.o: +-@OS_WINDOWS_TRUE@ $(LIBTOOL) --tag=RC --mode=compile $(RC) -I$(top_srcdir)/include -DCURL_EMBED_MANIFEST $(RCFLAGS) -i $< -o $@ ++@OS_WINDOWS_TRUE@ $(RC) -I$(top_srcdir)/include -DCURL_EMBED_MANIFEST $(RCFLAGS) -i $< -o $@ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded.