From 3c8dbbb58427a183257cfad6901e8da5bf392360 Mon Sep 17 00:00:00 2001 From: Shuanglei Tao Date: Tue, 11 Oct 2022 21:09:49 +0800 Subject: [PATCH] scripts: update mingw-build.sh --- .github/workflows/backend.yml | 3 ++- .github/workflows/release.yml | 3 ++- scripts/mingw-build.sh | 37 ++++++++++++----------------------- 3 files changed, 16 insertions(+), 27 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 55b60e0..9dff623 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -67,7 +67,8 @@ jobs: with: msystem: MINGW64 install: >- - make + base-devel + subversion mingw64/mingw-w64-x86_64-gcc mingw64/mingw-w64-x86_64-cmake mingw64/mingw-w64-x86_64-zlib diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fa028aa..a0ea6bf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -57,7 +57,8 @@ jobs: with: msystem: MINGW64 install: >- - make + base-devel + subversion mingw64/mingw-w64-x86_64-gcc mingw64/mingw-w64-x86_64-cmake mingw64/mingw-w64-x86_64-zlib diff --git a/scripts/mingw-build.sh b/scripts/mingw-build.sh index 48f5dd8..6366dcb 100644 --- a/scripts/mingw-build.sh +++ b/scripts/mingw-build.sh @@ -2,39 +2,26 @@ set -eo pipefail -TMPDIR="${TMPDIR:-/tmp}" -JSON_C_VERSION="${JSON_C_VERSION:-0.15}" -LIBWEBSOCKETS_VERSION="${LIBWEBSOCKETS_VERSION:-4.3.2}" - build_libwebsockets() { - curl -sLo- "https://github.com/warmcat/libwebsockets/archive/v${LIBWEBSOCKETS_VERSION}.tar.gz" | tar xz -f - -C "${TMPDIR}" - pushd "${TMPDIR}/libwebsockets-${LIBWEBSOCKETS_VERSION}" - sed -i 's/ websockets_shared//g' cmake/libwebsockets-config.cmake.in - sed -i '/PC_OPENSSL/d' lib/tls/CMakeLists.txt - rm -rf build && mkdir -p build && cd build - MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ - cmake -G"MSYS Makefiles" \ - -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ - -DCMAKE_BUILD_TYPE=RELEASE \ - -DCMAKE_FIND_LIBRARY_SUFFIXES=".a" \ - -DCMAKE_EXE_LINKER_FLAGS="-static" \ - -DLWS_WITH_MBEDTLS=ON \ - -DLWS_WITH_DIR=OFF \ - -DLWS_WITHOUT_DAEMONIZE=ON \ - -DLWS_WITHOUT_TESTAPPS=ON \ - -DLWS_WITH_LIBUV=ON \ - .. - make -j"$(nproc)" install + svn co https://github.com/msys2/MINGW-packages/trunk/mingw-w64-libwebsockets + sed -i 's/openssl/mbedtls/' mingw-w64-libwebsockets/PKGBUILD + sed -i '/-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX}/a \ -DLWS_WITH_MBEDTLS=ON \\' mingw-w64-libwebsockets/PKGBUILD + sed -i '/-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX}/a \ -DLWS_WITH_LIBUV=ON \\' mingw-w64-libwebsockets/PKGBUILD + pushd mingw-w64-libwebsockets + makepkg-mingw --cleanbuild --syncdeps --force --noconfirm + pacman -U *.pkg.tar.zst --noconfirm popd } build_libwebsockets +# workaround for the lib name change +cp /mingw64/lib/libuv_a.a /mingw64/lib/libuv.a + rm -rf build && mkdir -p build && cd build -cmake -G"MSYS Makefiles" \ +cmake -DCMAKE_BUILD_TYPE=RELEASE \ -DCMAKE_FIND_LIBRARY_SUFFIXES=".a" \ -DCMAKE_C_FLAGS="-Os -ffunction-sections -fdata-sections -fno-unwind-tables -fno-asynchronous-unwind-tables -flto" \ -DCMAKE_EXE_LINKER_FLAGS="-static -no-pie -Wl,-s -Wl,-Bsymbolic -Wl,--gc-sections" \ - -DCMAKE_BUILD_TYPE=RELEASE \ .. -make install +cmake --build . -- 2.43.4