Mercurial > mxe-octave
changeset 6577:dc7335a5a446
curl: update to v7.87.0
* src/curl.mk: update to v7.87.0
* src/curl-1-fixes.patch: deleted
* dist-files.mk: remove ref to deleted file
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Thu, 22 Dec 2022 17:57:32 -0500 |
| parents | 03860a88b499 |
| children | 8c0c105d9d45 |
| files | dist-files.mk src/curl-1-fixes.patch src/curl.mk |
| diffstat | 3 files changed, 2 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Sun Nov 27 19:08:31 2022 +0100 +++ b/dist-files.mk Thu Dec 22 17:57:32 2022 -0500 @@ -69,7 +69,6 @@ cminpack.mk \ cppunit.mk \ cunit.mk \ - curl-1-fixes.patch \ curl-test.c \ curl.mk \ damageproto.mk \
--- a/src/curl-1-fixes.patch Sun Nov 27 19:08:31 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -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.
--- a/src/curl.mk Sun Nov 27 19:08:31 2022 +0100 +++ b/src/curl.mk Thu Dec 22 17:57:32 2022 -0500 @@ -3,8 +3,8 @@ PKG := curl $(PKG)_IGNORE := -$(PKG)_VERSION := 7.86.0 -$(PKG)_CHECKSUM := 289a3aaec47f98a52474cd34243d6b7f51f8e525 +$(PKG)_VERSION := 7.87.0 +$(PKG)_CHECKSUM := cc61d854fc1dbb769052839829f9412d41879674 $(PKG)_SUBDIR := curl-$($(PKG)_VERSION) $(PKG)_FILE := curl-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://curl.haxx.se/download/$($(PKG)_FILE)