update cross build script

Author: tsl0922

.github/workflows/backend.yml

@@ -24,9 +24,9 @@ jobs:
       VCPKG_TRIPLET: x64-windows-static
       TOOLCHAIN_FILE: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Checkout vcpkg
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: microsoft/vcpkg
           path: vcpkg
@@ -44,7 +44,7 @@ jobs:
           $env:VCPKG_ROOT = "${{ env.VCPKG_ROOT }}"
           cmake -S . -B build -G "Visual Studio 17 2022" -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="${{ env.TOOLCHAIN_FILE }}" -DVCPKG_TARGET_TRIPLET=${{ env.VCPKG_TRIPLET }}
           cmake --build build --config Release
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: ttyd.msvc
           path: build/Release/ttyd.exe
@@ -53,7 +53,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [i686, x86_64, arm, armhf, aarch64, mips, mipsel, mips64, mips64el, s390x, win32]
+        target: [i686, x86_64, arm, armhf, aarch64, mips, mipsel, mips64, mips64el, ppc64, ppc64le, s390x, win32]
     steps:
       - uses: actions/checkout@v6
       - name: Install packages

CMakeLists.txt

@@ -86,7 +86,8 @@ if(LWS_OPENSSL_ENABLED AND NOT LWS_MBEDTLS_ENABLED)
 endif()
 
 if(WIN32)
-    list(APPEND LINK_LIBS shell32 ws2_32)
+    # libuv static requires dbghelp for MiniDumpWriteDump/Sym* APIs
+    list(APPEND LINK_LIBS shell32 ws2_32 dbghelp)
     if(MSVC)
         find_package(getopt CONFIG)
         if(getopt_FOUND)
@@ -96,8 +97,6 @@ if(WIN32)
                 list(APPEND LINK_LIBS getopt::getopt_static)
             endif()
         endif()
-        # libuv static requires dbghelp for MiniDumpWriteDump/Sym* APIs
-        list(APPEND LINK_LIBS dbghelp)
     endif()
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/app.rc.in ${CMAKE_CURRENT_BINARY_DIR}/app.rc @ONLY)
     list(APPEND SOURCE_FILES ${CMAKE_CURRENT_BINARY_DIR}/app.rc)

scripts/cross-build.sh

@@ -11,10 +11,10 @@ BUILD_ROOT="${BUILD_ROOT:-/opt/build}"
 BUILD_TARGET="${BUILD_TARGET:-x86_64}"
 
 ZLIB_VERSION="${ZLIB_VERSION:-1.3.2}"
-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.6}"
+JSON_C_VERSION="${JSON_C_VERSION:-0.18}"
+OPENSSL_VERSION="${OPENSSL_VERSION:-3.6.1}"
+LIBUV_VERSION="${LIBUV_VERSION:-1.52.1}"
+LIBWEBSOCKETS_VERSION="${LIBWEBSOCKETS_VERSION:-4.5.7}"
 
 build_zlib() {
     echo "=== Building zlib-${ZLIB_VERSION} (${TARGET})..."
@@ -41,17 +41,37 @@ build_json-c() {
     popd
 }
 
-build_mbedtls() {
-    echo "=== Building mbedtls-${MBEDTLS_VERSION} (${TARGET})..."
-    curl -fSsLo- "https://github.com/ARMmbed/mbedtls/archive/v${MBEDTLS_VERSION}.tar.gz" | tar xz -C "${BUILD_DIR}"
-    pushd "${BUILD_DIR}/mbedtls-${MBEDTLS_VERSION}"
-        rm -rf build && mkdir -p build && cd build
-        cmake -DCMAKE_TOOLCHAIN_FILE="${BUILD_DIR}/cross-${TARGET}.cmake" \
-            -DCMAKE_BUILD_TYPE=RELEASE \
-            -DCMAKE_INSTALL_PREFIX="${STAGE_DIR}" \
-            -DENABLE_TESTING=OFF \
-            ..
-        make -j"$(nproc)" install
+map_openssl_target() {
+    case $1 in
+        i686) echo linux-generic32 ;;
+        x86_64) echo linux-x86_64 ;;
+        arm|armhf|armv7l) echo linux-armv4 ;;
+        aarch64) echo linux-aarch64 ;;
+        mips|mipsel) echo linux-mips32 ;;
+        mips64|mips64el) echo linux64-mips64 ;;
+        powerpc64) echo linux-ppc64 ;;
+        powerpc64le) echo linux-ppc64le ;;
+        s390x) echo linux64-s390x ;;
+        win32) echo mingw64 ;;
+        *) echo "unknown openssl target: $1" && exit 1
+    esac
+}
+
+build_openssl() {
+    openssl_target=$(map_openssl_target "${BUILD_TARGET}")
+    echo "=== Building openssl-${OPENSSL_VERSION} (${openssl_target})..."
+    curl -sLo- "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" | tar xz -C "${BUILD_DIR}"
+    pushd "${BUILD_DIR}/openssl-${OPENSSL_VERSION}"
+        openssl_cflags="-fPIC -latomic"
+        case ${BUILD_TARGET} in
+            s390x) openssl_cflags="${openssl_cflags} -march=z10" ;;
+            win32)
+                curl -sLo- https://github.com/openssl/openssl/pull/29826.patch | patch -p1
+                ;;
+        esac
+        env CC=gcc CROSS_COMPILE="${TARGET}-" CFLAGS="${openssl_cflags}" \
+            ./Configure "${openssl_target}" no-ssl3 no-err -DOPENSSL_SMALL_FOOTPRINT --prefix="${STAGE_DIR}" \
+        && make -j"$(nproc)" all > /dev/null && make install_sw
     popd
 }
 
@@ -86,16 +106,14 @@ 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" \
             -DCMAKE_BUILD_TYPE=RELEASE \
             -DCMAKE_INSTALL_PREFIX="${STAGE_DIR}" \
             -DCMAKE_FIND_LIBRARY_SUFFIXES=".a" \
             -DCMAKE_EXE_LINKER_FLAGS="-static" \
             -DLWS_WITHOUT_TESTAPPS=ON \
-            -DLWS_WITH_MBEDTLS=ON \
+            -DLWS_WITH_SSL=ON \
             -DLWS_WITH_LIBUV=ON \
             -DLWS_STATIC_PIC=ON \
             -DLWS_WITH_SHARED=OFF \
@@ -104,13 +122,21 @@ build_libwebsockets() {
             -DLWS_ROLE_RAW_FILE=OFF \
             -DLWS_WITH_HTTP2=ON \
             -DLWS_WITH_HTTP_BASIC_AUTH=OFF \
+            -DLWS_WITH_HTTP_STREAM_COMPRESSION=ON \
             -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 \
             -DLWS_WITH_SEQUENCER=OFF \
+            -DLWS_WITH_UPNG=OFF \
+            -DLWS_WITH_JPEG=OFF \
+            -DLWS_WITH_DLO=OFF \
+            -DLWS_WITH_SYS_STATE=OFF \
+            -DLWS_WITH_SYS_SMD=OFF \
+            -DLWS_WITH_SECURE_STREAMS=OFF \
+            -DLWS_CTEST_INTERNET_AVAILABLE=OFF \
             ..
         make -j"$(nproc)" install
     popd
@@ -159,7 +185,7 @@ build() {
     build_zlib
     build_json-c
     build_libuv
-    build_mbedtls
+    build_openssl
     build_libwebsockets
     build_ttyd
 }
@@ -168,10 +194,12 @@ case ${BUILD_TARGET} in
     amd64) BUILD_TARGET="x86_64" ;;
     arm64) BUILD_TARGET="aarch64" ;;
     armv7) BUILD_TARGET="armv7l" ;;
+    ppc64) BUILD_TARGET="powerpc64" ;;
+    ppc64le) BUILD_TARGET="powerpc64le" ;;
 esac
 
 case ${BUILD_TARGET} in
-    i686|x86_64|aarch64|mips|mipsel|mips64|mips64el|s390x)
+    i686|x86_64|aarch64|mips|mipsel|mips64|mips64el|powerpc64|powerpc64le|s390x)
         build "${BUILD_TARGET}-linux-musl" "${BUILD_TARGET}"
         ;;
     arm)