diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-08 08:14:45 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-08 08:14:56 +0000 |
| commit | 62010aafd4014c19d4d0cf36f01d3c53b43c5e7b (patch) | |
| tree | 6f1fd3cfe312292e359bb7befa4b44a5fe986182 /scripts | |
| parent | Releasing debian version 1.7.3-2. (diff) | |
| download | ttyd-62010aafd4014c19d4d0cf36f01d3c53b43c5e7b.tar.xz ttyd-62010aafd4014c19d4d0cf36f01d3c53b43c5e7b.zip | |
Merging upstream version 1.7.7.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/cross-build.sh | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/scripts/cross-build.sh b/scripts/cross-build.sh index ea9fc7a..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.2.13}" -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})..." |