diff options
| author | fuzzard <fuzzard@users.noreply.github.com> | 2023-08-07 11:06:43 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-07 11:06:43 +1000 |
| commit | de122ac8e22f8946ed344c6cf1444f0aa9634d7c (patch) | |
| tree | 2213e6cd83a6ebecee829fe52000500376f6f5ba /tools/depends | |
| parent | 3f4731fa36bc31d0e1ce7688052793a2ec8349c5 (diff) | |
| parent | 9407633518ee99e0480b304f0ac53a548106bf9f (diff) | |
Merge pull request #23466 from joseluismarti/curl8
[depends] bump curl to 8.1.2
Diffstat (limited to 'tools/depends')
| -rw-r--r-- | tools/depends/target/curl/01-patch-autoconf-GH-5130.patch | 11 | ||||
| -rw-r--r-- | tools/depends/target/curl/CURL-VERSION | 5 | ||||
| -rw-r--r-- | tools/depends/target/curl/Makefile | 17 |
3 files changed, 9 insertions, 24 deletions
diff --git a/tools/depends/target/curl/01-patch-autoconf-GH-5130.patch b/tools/depends/target/curl/01-patch-autoconf-GH-5130.patch deleted file mode 100644 index 119cd81199..0000000000 --- a/tools/depends/target/curl/01-patch-autoconf-GH-5130.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/m4/curl-functions.m4 -+++ b/m4/curl-functions.m4 -@@ -7289,8 +7289,6 @@ - dnl changes contained within this macro. - - AC_DEFUN([CURL_RUN_IFELSE], [ -- AC_REQUIRE([AC_RUN_IFELSE])dnl -- - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH diff --git a/tools/depends/target/curl/CURL-VERSION b/tools/depends/target/curl/CURL-VERSION new file mode 100644 index 0000000000..10caf28174 --- /dev/null +++ b/tools/depends/target/curl/CURL-VERSION @@ -0,0 +1,5 @@ +LIBNAME=curl +VERSION=8.1.2 +ARCHIVE=$(LIBNAME)-$(VERSION).tar.xz +SHA512=532ab96eba6dea66d272f3be56f5af5c5da922480f9a10e203de98037c311f12f8145ba6bf813831e42815e068874ccfd108f84f7650743f5dbb3ebc3bc9c4f4 +BYPRODUCT=libcurl.a diff --git a/tools/depends/target/curl/Makefile b/tools/depends/target/curl/Makefile index 81c3130caf..76ddb64e97 100644 --- a/tools/depends/target/curl/Makefile +++ b/tools/depends/target/curl/Makefile @@ -1,28 +1,19 @@ -include ../../Makefile.include -DEPS = ../../Makefile.include Makefile 01-patch-autoconf-GH-5130.patch ../../download-files.include - -# lib name, version -LIBNAME=curl -VERSION=7.68.0 -SOURCE=$(LIBNAME)-$(VERSION) -ARCHIVE=$(SOURCE).tar.bz2 -SHA512=ad7390fd700cb74db356a39e842dab011823b87d4047687f2a8c2e0f2920a4f8c6c193ba56391489a75939cc5c39a4dccec4e4ceeac516eb7394f03e0fb7aeae -include ../../download-files.include +include ../../Makefile.include CURL-VERSION ../../download-files.include +DEPS = ../../Makefile.include Makefile CURL-VERSION ../../download-files.include + # configuration settings CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \ ./configure --prefix=$(PREFIX) --disable-shared --disable-ldap \ --without-libssh2 --disable-ntlm-wb --enable-ipv6 --without-librtmp \ --without-libidn2 --with-ca-fallback --with-ssl=$(PREFIX) --with-nghttp2=$(PREFIX) -LIBDYLIB=$(PLATFORM)/lib/.libs/lib$(LIBNAME).a +LIBDYLIB=$(PLATFORM)/lib/.libs/$(BYPRODUCT) all: .installed-$(PLATFORM) - $(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - cd $(PLATFORM); patch -p1 -i ../01-patch-autoconf-GH-5130.patch cd $(PLATFORM); $(AUTORECONF) -vif cd $(PLATFORM); $(CONFIGURE) |