diff options
| author | Stan Grishin <stangri@melmac.ca> | 2024-04-04 08:12:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-04 08:12:24 -0700 |
| commit | f410661f7bd92881c89403e1174029279688eb3a (patch) | |
| tree | d2a4e85eaa5f3aa1f372cd8f5b758a00f77c1a01 /net | |
| parent | 06332b022937714fe465c572d7ae0c7665e7552b (diff) | |
| parent | 227c8daa159acdc84aad9e06a6a33f7d07263130 (diff) | |
Merge pull request #23787 from stangri/master-curl
curl: update to 8.7.1
Diffstat (limited to 'net')
| -rw-r--r-- | net/curl/Makefile | 7 | ||||
| -rw-r--r-- | net/curl/patches/200-no_docs_tests.patch | 12 |
2 files changed, 12 insertions, 7 deletions
diff --git a/net/curl/Makefile b/net/curl/Makefile index 1969d2dee..5ad13c4c5 100644 --- a/net/curl/Makefile +++ b/net/curl/Makefile @@ -9,15 +9,15 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/nls.mk PKG_NAME:=curl -PKG_VERSION:=8.6.0 -PKG_RELEASE:=1 +PKG_VERSION:=8.7.1 +PKG_RELEASE:=r1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://github.com/curl/curl/releases/download/curl-$(subst .,_,$(PKG_VERSION))/ \ https://dl.uxnr.de/mirror/curl/ \ https://curl.askapache.com/download/ \ https://curl.se/download/ -PKG_HASH:=b4785f2d8877fa92c0e45d7155cf8cc6750dbda961f4b1a45bcbec990cf2fa9b +PKG_HASH:=05bbd2b698e9cfbab477c33aa5e99b4975501835a41b7ca6ca71de03d8849e76 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING @@ -113,6 +113,7 @@ TARGET_LDFLAGS += -Wl,--gc-sections CONFIGURE_ARGS += \ --disable-debug \ + --disable-docs \ --disable-ares \ --enable-shared \ --enable-static \ diff --git a/net/curl/patches/200-no_docs_tests.patch b/net/curl/patches/200-no_docs_tests.patch index 4e0ec1aa3..9284b67e5 100644 --- a/net/curl/patches/200-no_docs_tests.patch +++ b/net/curl/patches/200-no_docs_tests.patch @@ -3,18 +3,22 @@ @@ -135,7 +135,7 @@ CLEANFILES = $(VC14_LIBVCXPROJ) $(VC14_S bin_SCRIPTS = curl-config - SUBDIRS = lib src + SUBDIRS = lib docs src scripts -DIST_SUBDIRS = $(SUBDIRS) tests packages scripts include docs +DIST_SUBDIRS = $(SUBDIRS) packages include pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libcurl.pc -@@ -243,8 +243,6 @@ cygwinbin: - # We extend the standard install with a custom hook: +@@ -244,12 +244,9 @@ cygwinbin: + if BUILD_DOCS install-data-hook: (cd include && $(MAKE) install) - (cd docs && $(MAKE) install) - (cd docs/libcurl && $(MAKE) install) + else + install-data-hook: + (cd include && $(MAKE) install) +- (cd docs && $(MAKE) install) + endif # We extend the standard uninstall with a custom hook: - uninstall-hook: |