diff options
| author | Ladar Levison <ladar@lavabit.com> | 2020-06-09 12:50:26 +0300 |
|---|---|---|
| committer | Ladar Levison <ladar@lavabit.com> | 2020-06-09 12:50:26 +0300 |
| commit | 34398b60192c917209684ca04646eb7e4b1513a7 (patch) | |
| tree | 58132c9947420b1c7c741559fe4d8b633b0313ae | |
| parent | 76a8044bf993f1c3116b4a94048ae91017bafe0e (diff) | |
Adding the cURL bundle fix to build script.
| -rwxr-xr-x | dev/scripts/builders/build.lib.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/dev/scripts/builders/build.lib.sh b/dev/scripts/builders/build.lib.sh index f2623f56..07c00de0 100755 --- a/dev/scripts/builders/build.lib.sh +++ b/dev/scripts/builders/build.lib.sh @@ -622,7 +622,10 @@ curl() { curl-prep) cd "$M_SOURCES/curl"; error cat "$M_PATCHES/curl/"skip_test172-version7.23.1.patch | patch -p1 --verbose &>> "$M_LOGS/curl.txt"; error - cat "$M_PATCHES/curl/"7.23.1_curl_exec_perm_fix.patch | patch -p1 --verbose &>> "$M_LOGS/curl.txt"; error + if [ "$CURL" == "curl-7.23.1" ]; then + cat "$M_PATCHES/curl/"7.23.1_curl_exec_perm_fix.patch | patch -p1 --verbose &>> "$M_LOGS/curl.txt"; error + cat "$M_PATCHES/curl/"7.23.1_fix_ca_bundle_url.patch | patch -p1 --verbose &>> "$M_LOGS/curl.txt"; error + fi ;; curl-build) # Note that if we don't include the debug configure option we can't run a check-full. |