Skip to content

Commit f132dae

Browse files
committed
fix missed curl failure
1 parent 6f62cdc commit f132dae

4 files changed

Lines changed: 28 additions & 5 deletions

File tree

Build/libHttpClient.Linux/curl_Linux.bash

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/bin/bash
22

3+
set -e
4+
35
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
46
CONFIGURATION="Release"
57

@@ -31,14 +33,26 @@ else
3133
echo "No previously-built library present at $SCRIPT_DIR/../../Out/x64/$CONFIGURATION/libcurl.Linux/libcurl.a - performing build"
3234
fi
3335

36+
# FIXME: OPENSSL_INSTALL_DIR="$SCRIPT_DIR/../../Int/x64/$CONFIGURATION/openssl.Linux/"
37+
OPENSSL_INSTALL_DIR=/usr/local/ssl
38+
39+
CONFIGURE_ARGS=(
40+
--disable-shared
41+
--with-zlib
42+
--disable-dependency-tracking
43+
--with-openssl=$OPENSSL_INSTALL_DIR
44+
--enable-symbol-hiding
45+
--without-brotli
46+
)
3447
if [ "$CONFIGURATION" = "Debug" ]; then
35-
# make libcrypto and libssl
36-
./configure --disable-shared --with-zlib --disable-dependency-tracking -with-openssl=/usr/local/ssl --enable-symbol-hiding --enable-debug --without-brotli
48+
CONFIGURE_ARGS+=(--enable-debug)
3749
else
38-
# make libcrypto and libssl
39-
./configure --disable-shared --with-zlib --disable-dependency-tracking -with-openssl=/usr/local/ssl --enable-symbol-hiding --disable-debug --without-brotli
50+
CONFIGURE_ARGS+=(--disable-debug)
4051
fi
4152

53+
# make libcrypto and libssl
54+
./configure "${CONFIGURE_ARGS[@]}"
55+
4256
MAKE_PARALLELISM="-j$(nproc)" # run Make in parallel to speed up the build process
4357
make $MAKE_PARALLELISM
4458

Build/libHttpClient.Linux/install_dependencies.bash

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
#!/bin/bash
22

3+
set -e
4+
35
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
46

7+
POSITIONAL_ARGS=()
58
DO_INSTALL=true
69
while [[ $# -gt 0 ]]; do
710
case $1 in
@@ -20,6 +23,8 @@ while [[ $# -gt 0 ]]; do
2023
esac
2124
done
2225

26+
set -- "${POSITIONAL_ARGS[@]}" # restore positional parameters
27+
2328
build_dependencies=(clang make autoconf automake libtool)
2429
library_dependencies=(zlib1g zlib1g-dev)
2530

@@ -49,4 +54,4 @@ echo "Library dependencies: ${library_dependencies[*]}"
4954

5055
sudo hwclock --hctosys
5156
sudo apt-get update
52-
sudo apt-get install "${build_dependencies[@]}" "${library_dependencies[@]}"
57+
sudo apt-get -y install "${build_dependencies[@]}" "${library_dependencies[@]}"

Build/libHttpClient.Linux/libHttpClient_Linux.bash

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/bin/bash
22

3+
set -e
4+
35
log () {
46
echo "***** $1 *****"
57
}

Build/libHttpClient.Linux/openssl_Linux.bash

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/bin/bash
22

3+
set -e
4+
35
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
46
OPENSSL_SRC="$SCRIPT_DIR/../../External/openssl"
57
CONFIGURATION="Release"

0 commit comments

Comments
 (0)