lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-10-26 02:17:35 +03:00
Code Activity

ci/GHA: fix Linux autotools jobs to honor their zlib settings

Browse Source 
Also rename `crossoptions` variables to `options`.

Closes #1685
This commit is contained in:
Viktor Szakats
2025-09-27 20:37:09 +02:00
parent 9ce9909df5
commit 1f79b00505
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.github/workflows/ci.yml vendored
View File

@@ -332,10 +332,10 @@ jobs:
curl -fsS -L "https://github.com/Mbed-TLS/mbedtls/releases/download/mbedtls-${MBEDTLS_VERSION}/mbedtls-${MBEDTLS_VERSION}.tar.bz2" | tar -xj curl -fsS -L "https://github.com/Mbed-TLS/mbedtls/releases/download/mbedtls-${MBEDTLS_VERSION}/mbedtls-${MBEDTLS_VERSION}.tar.bz2" | tar -xj
cd "mbedtls-${MBEDTLS_VERSION}" cd "mbedtls-${MBEDTLS_VERSION}"
if [ "${MATRIX_ARCH}" = 'i386' ]; then if [ "${MATRIX_ARCH}" = 'i386' ]; then
crossoptions="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_VERSION=1 -DCMAKE_SYSTEM_PROCESSOR=${MATRIX_ARCH}" options="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_VERSION=1 -DCMAKE_SYSTEM_PROCESSOR=${MATRIX_ARCH}"
cflags='-m32 -mpclmul -msse2 -maes' cflags='-m32 -mpclmul -msse2 -maes'
fi fi
cmake -B . -G Ninja ${crossoptions} \ cmake -B . -G Ninja ${options} \
-DCMAKE_C_FLAGS="${cflags}" \ -DCMAKE_C_FLAGS="${cflags}" \
-DENABLE_PROGRAMS=OFF \ -DENABLE_PROGRAMS=OFF \
-DENABLE_TESTING=OFF \ -DENABLE_TESTING=OFF \
@@ -534,12 +534,17 @@ jobs:
|| { cat bld/CMakeFiles/CMake*.yaml; false; } || { cat bld/CMakeFiles/CMake*.yaml; false; }
else else
if [ "${MATRIX_ARCH}" = 'i386' ]; then if [ "${MATRIX_ARCH}" = 'i386' ]; then
crossoptions='--host=i686-pc-linux-gnu' options='--host=i686-pc-linux-gnu'
export CFLAGS=-m32 export CFLAGS=-m32
fi fi
mkdir bld && cd bld mkdir bld && cd bld
if [ "${MATRIX_ZLIB}" = 'OFF' ]; then
options+=' --with-libz=no'
else
options+=' --with-zlib'
fi
../configure --enable-werror --enable-debug \ ../configure --enable-werror --enable-debug \
${crossoptions} ${MATRIX_OPTIONS} \ ${options} ${MATRIX_OPTIONS} \
--disable-dependency-tracking \ --disable-dependency-tracking \
|| { tail -n 1000 config.log; false; } || { tail -n 1000 config.log; false; }
fi fi