summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
Diffstat (limited to 'external')
-rw-r--r--external/curl/ExternalPackage_curl.mk2
-rw-r--r--external/curl/ExternalProject_curl.mk2
-rw-r--r--external/curl/UnpackedTarball_curl.mk1
-rw-r--r--external/curl/configure-eval-fix.patch.0146
4 files changed, 2 insertions, 149 deletions
diff --git a/external/curl/ExternalPackage_curl.mk b/external/curl/ExternalPackage_curl.mk
index 0485dacb2d3b..ee0cf4501478 100644
--- a/external/curl/ExternalPackage_curl.mk
+++ b/external/curl/ExternalPackage_curl.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.4.dyli
else ifeq ($(OS),AIX)
$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so,lib/.libs/libcurl.so.4))
else
-$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.7.0))
+$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.8.0))
endif
endif # $(DISABLE_DYNLOADING)
diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk
index 6b524f4d5a1a..cad4199b5927 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -43,7 +43,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
$(gb_RUN_CONFIGURE) ./configure \
$(if $(filter iOS MACOSX,$(OS)),\
--with-secure-transport,\
- $(if $(ENABLE_NSS),--with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out"),--without-nss)) \
+ $(if $(ENABLE_NSS),--with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out") --with-nss-deprecated,--without-nss)) \
--without-ssl --without-gnutls --without-polarssl --without-cyassl --without-axtls --without-mbedtls \
--enable-ftp --enable-http --enable-ipv6 \
--without-libidn2 --without-libpsl --without-librtmp \
diff --git a/external/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk
index 7a8f5a265341..b89b000228c9 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -26,7 +26,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\
external/curl/curl-7.26.0_win-proxy.patch \
external/curl/zlib.patch.0 \
external/curl/configurable-z-option.patch.0 \
- external/curl/configure-eval-fix.patch.0 \
))
ifeq ($(SYSTEM_NSS),)
diff --git a/external/curl/configure-eval-fix.patch.0 b/external/curl/configure-eval-fix.patch.0
deleted file mode 100644
index 616f3fb607ad..000000000000
--- a/external/curl/configure-eval-fix.patch.0
+++ /dev/null
@@ -1,146 +0,0 @@
---- configure
-+++ configure
-@@ -17942,7 +17942,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -18230,7 +18230,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -19676,7 +19676,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -22525,7 +22525,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -24251,7 +24251,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -34015,7 +34015,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -34479,7 +34479,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -37507,7 +37507,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -39014,7 +39014,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -39259,7 +39259,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -39527,7 +39527,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -39787,7 +39787,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -40833,7 +40833,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -41238,7 +41238,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -43189,7 +43189,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
-@@ -43305,7 +43305,7 @@
- *) library_path_var=LD_LIBRARY_PATH ;;
- esac
-
-- eval "old=$$library_path_var"
-+ eval "old=\$$library_path_var"
- eval "$library_path_var=\$CURL_LIBRARY_PATH:\$old"
-
- eval "export $library_path_var"
generated by cgit (git 2.34.1) at 2025-02-13 12:16:56 +0000