Merge pull request #23787 from stangri/master-curl
curl: update to 8.7.1
This commit is contained in:
commit
f410661f7b
|
@ -9,15 +9,15 @@ include $(TOPDIR)/rules.mk
|
||||||
include $(INCLUDE_DIR)/nls.mk
|
include $(INCLUDE_DIR)/nls.mk
|
||||||
|
|
||||||
PKG_NAME:=curl
|
PKG_NAME:=curl
|
||||||
PKG_VERSION:=8.6.0
|
PKG_VERSION:=8.7.1
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=r1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
||||||
PKG_SOURCE_URL:=https://github.com/curl/curl/releases/download/curl-$(subst .,_,$(PKG_VERSION))/ \
|
PKG_SOURCE_URL:=https://github.com/curl/curl/releases/download/curl-$(subst .,_,$(PKG_VERSION))/ \
|
||||||
https://dl.uxnr.de/mirror/curl/ \
|
https://dl.uxnr.de/mirror/curl/ \
|
||||||
https://curl.askapache.com/download/ \
|
https://curl.askapache.com/download/ \
|
||||||
https://curl.se/download/
|
https://curl.se/download/
|
||||||
PKG_HASH:=b4785f2d8877fa92c0e45d7155cf8cc6750dbda961f4b1a45bcbec990cf2fa9b
|
PKG_HASH:=05bbd2b698e9cfbab477c33aa5e99b4975501835a41b7ca6ca71de03d8849e76
|
||||||
|
|
||||||
PKG_LICENSE:=MIT
|
PKG_LICENSE:=MIT
|
||||||
PKG_LICENSE_FILES:=COPYING
|
PKG_LICENSE_FILES:=COPYING
|
||||||
|
@ -113,6 +113,7 @@ TARGET_LDFLAGS += -Wl,--gc-sections
|
||||||
|
|
||||||
CONFIGURE_ARGS += \
|
CONFIGURE_ARGS += \
|
||||||
--disable-debug \
|
--disable-debug \
|
||||||
|
--disable-docs \
|
||||||
--disable-ares \
|
--disable-ares \
|
||||||
--enable-shared \
|
--enable-shared \
|
||||||
--enable-static \
|
--enable-static \
|
||||||
|
|
|
@ -3,18 +3,22 @@
|
||||||
@@ -135,7 +135,7 @@ CLEANFILES = $(VC14_LIBVCXPROJ) $(VC14_S
|
@@ -135,7 +135,7 @@ CLEANFILES = $(VC14_LIBVCXPROJ) $(VC14_S
|
||||||
bin_SCRIPTS = curl-config
|
bin_SCRIPTS = curl-config
|
||||||
|
|
||||||
SUBDIRS = lib src
|
SUBDIRS = lib docs src scripts
|
||||||
-DIST_SUBDIRS = $(SUBDIRS) tests packages scripts include docs
|
-DIST_SUBDIRS = $(SUBDIRS) tests packages scripts include docs
|
||||||
+DIST_SUBDIRS = $(SUBDIRS) packages include
|
+DIST_SUBDIRS = $(SUBDIRS) packages include
|
||||||
|
|
||||||
pkgconfigdir = $(libdir)/pkgconfig
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
pkgconfig_DATA = libcurl.pc
|
pkgconfig_DATA = libcurl.pc
|
||||||
@@ -243,8 +243,6 @@ cygwinbin:
|
@@ -244,12 +244,9 @@ cygwinbin:
|
||||||
# We extend the standard install with a custom hook:
|
if BUILD_DOCS
|
||||||
install-data-hook:
|
install-data-hook:
|
||||||
(cd include && $(MAKE) install)
|
(cd include && $(MAKE) install)
|
||||||
- (cd docs && $(MAKE) install)
|
- (cd docs && $(MAKE) install)
|
||||||
- (cd docs/libcurl && $(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:
|
# We extend the standard uninstall with a custom hook:
|
||||||
uninstall-hook:
|
|
||||||
|
|
Loading…
Reference in New Issue