summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 02:54:50 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 02:54:50 +0000
commit451520af975c978c8ffaa1d9a0959b50c1b8e294 (patch)
treec2abdd80665f8494280a65417a9c21156ff41125 /scripts
parentAdding upstream version 1.7.4. (diff)
downloadttyd-451520af975c978c8ffaa1d9a0959b50c1b8e294.tar.xz
ttyd-451520af975c978c8ffaa1d9a0959b50c1b8e294.zip
Adding upstream version 1.7.7.upstream/1.7.7upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/cross-build.sh14
1 files changed, 8 insertions, 6 deletions
diff --git a/scripts/cross-build.sh b/scripts/cross-build.sh
index d5778f5..8c350c5 100755
--- a/scripts/cross-build.sh
+++ b/scripts/cross-build.sh
@@ -10,11 +10,11 @@ STAGE_ROOT="${STAGE_ROOT:-/opt/stage}"
BUILD_ROOT="${BUILD_ROOT:-/opt/build}"
BUILD_TARGET="${BUILD_TARGET:-x86_64}"
-ZLIB_VERSION="${ZLIB_VERSION:-1.3}"
-JSON_C_VERSION="${JSON_C_VERSION:-0.16}"
-MBEDTLS_VERSION="${MBEDTLS_VERSION:-2.28.1}"
+ZLIB_VERSION="${ZLIB_VERSION:-1.3.1}"
+JSON_C_VERSION="${JSON_C_VERSION:-0.17}"
+MBEDTLS_VERSION="${MBEDTLS_VERSION:-2.28.5}"
LIBUV_VERSION="${LIBUV_VERSION:-1.44.2}"
-LIBWEBSOCKETS_VERSION="${LIBWEBSOCKETS_VERSION:-4.3.2}"
+LIBWEBSOCKETS_VERSION="${LIBWEBSOCKETS_VERSION:-4.3.3}"
build_zlib() {
echo "=== Building zlib-${ZLIB_VERSION} (${TARGET})..."
@@ -86,6 +86,7 @@ build_libwebsockets() {
curl -fSsLo- "https://github.com/warmcat/libwebsockets/archive/v${LIBWEBSOCKETS_VERSION}.tar.gz" | tar xz -C "${BUILD_DIR}"
pushd "${BUILD_DIR}/libwebsockets-${LIBWEBSOCKETS_VERSION}"
sed -i 's/ websockets_shared//g' cmake/libwebsockets-config.cmake.in
+ sed -i 's/ OR PC_OPENSSL_FOUND//g' lib/tls/CMakeLists.txt
sed -i '/PC_OPENSSL/d' lib/tls/CMakeLists.txt
rm -rf build && mkdir -p build && cd build
cmake -DCMAKE_TOOLCHAIN_FILE="${BUILD_DIR}/cross-${TARGET}.cmake" \
@@ -101,10 +102,11 @@ build_libwebsockets() {
-DLWS_UNIX_SOCK=ON \
-DLWS_IPV6=ON \
-DLWS_ROLE_RAW_FILE=OFF \
- -DLWS_WITH_HTTP2=OFF \
+ -DLWS_WITH_HTTP2=ON \
-DLWS_WITH_HTTP_BASIC_AUTH=OFF \
-DLWS_WITH_UDP=OFF \
-DLWS_WITHOUT_CLIENT=ON \
+ -DLWS_WITHOUT_EXTENSIONS=OFF \
-DLWS_WITH_LEJP=OFF \
-DLWS_WITH_LEJP_CONF=OFF \
-DLWS_WITH_LWSAC=OFF \
@@ -143,7 +145,7 @@ build() {
echo "=== Installing toolchain ${ALIAS} (${TARGET})..."
- mkdir -p "${CROSS_ROOT}" && export PATH="${PATH}:/opt/cross/bin"
+ mkdir -p "${CROSS_ROOT}" && export PATH="${PATH}:${CROSS_ROOT}/bin"
curl -fSsLo- "${MUSL_CC_URL}/${TARGET}-cross.tgz" | tar xz -C "${CROSS_ROOT}" --strip-components=${COMPONENTS}
echo "=== Building target ${ALIAS} (${TARGET})..."