diff options
Diffstat (limited to 'external/curl')
| -rw-r--r-- | external/curl/UnpackedTarball_curl.mk | 1 | ||||
| -rw-r--r-- | external/curl/configure-eval-fix.patch.0 | 146 |
2 files changed, 147 insertions, 0 deletions
diff --git a/external/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk index b89b000228c9..7a8f5a265341 100644 --- a/external/curl/UnpackedTarball_curl.mk +++ b/external/curl/UnpackedTarball_curl.mk @@ -26,6 +26,7 @@ $(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 new file mode 100644 index 000000000000..616f3fb607ad --- /dev/null +++ b/external/curl/configure-eval-fix.patch.0 @@ -0,0 +1,146 @@ +--- 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" |