From: Viktor Szakats Date: Sat, 24 Jan 2026 22:22:21 +0000 (+0100) Subject: GHA: sync up configure option order across builds X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63d75de95d3e3b93f4146539fa1b7d868641898f;p=thirdparty%2Fcurl.git GHA: sync up configure option order across builds Closes #20423 --- diff --git a/.github/workflows/http3-linux.yml b/.github/workflows/http3-linux.yml index 5a9e1fdd9e..6d7dcdb449 100644 --- a/.github/workflows/http3-linux.yml +++ b/.github/workflows/http3-linux.yml @@ -269,8 +269,8 @@ jobs: git clone --quiet --depth 1 -b "v${WOLFSSL_VERSION}-stable" https://github.com/wolfSSL/wolfssl cd wolfssl ./autogen.sh - ./configure --disable-dependency-tracking --enable-all --enable-quic \ - --disable-benchmark --disable-crypttests --disable-examples --prefix="$PWD"/build + ./configure --disable-dependency-tracking --prefix="$PWD"/build --enable-all --enable-quic \ + --disable-benchmark --disable-crypttests --disable-examples make make install @@ -294,13 +294,14 @@ jobs: git clone --quiet --depth 1 -b "v${NGTCP2_VERSION}" https://github.com/ngtcp2/ngtcp2 cd ngtcp2 autoreconf -fi - ./configure --disable-dependency-tracking --prefix="$PWD"/build \ - PKG_CONFIG_PATH=/home/runner/libressl/build/lib/pkgconfig --enable-lib-only --with-openssl + ./configure --disable-dependency-tracking --prefix="$PWD"/build --enable-lib-only \ + PKG_CONFIG_PATH=/home/runner/libressl/build/lib/pkgconfig \ + --with-openssl make install make clean - ./configure --disable-dependency-tracking --prefix="$PWD"/build \ + ./configure --disable-dependency-tracking --prefix="$PWD"/build --enable-lib-only \ PKG_CONFIG_PATH=/home/runner/openssl/build/lib/pkgconfig:/home/runner/nettle/build/lib64/pkgconfig:/home/runner/gnutls/build/lib/pkgconfig:/home/runner/wolfssl/build/lib/pkgconfig \ - --enable-lib-only --with-openssl --with-gnutls --with-wolfssl --with-boringssl \ + --with-openssl --with-gnutls --with-wolfssl --with-boringssl \ BORINGSSL_LIBS='-L/home/runner/awslc/build/lib -lssl -lcrypto' \ BORINGSSL_CFLAGS='-I/home/runner/awslc/build/include' make install @@ -312,8 +313,8 @@ jobs: git clone --quiet --depth 1 -b "v${NGTCP2_VERSION}" https://github.com/ngtcp2/ngtcp2 ngtcp2-boringssl cd ngtcp2-boringssl autoreconf -fi - ./configure --disable-dependency-tracking --prefix="$PWD"/build \ - --enable-lib-only --with-openssl=no --with-boringssl \ + ./configure --disable-dependency-tracking --prefix="$PWD"/build --enable-lib-only \ + --with-openssl=no --with-boringssl \ BORINGSSL_LIBS='-L/home/runner/boringssl/build/lib -lssl -lcrypto' \ BORINGSSL_CFLAGS='-I/home/runner/boringssl/build/include' make install @@ -328,11 +329,10 @@ jobs: autoreconf -fi # required (for nghttpx application): libc-ares-dev libev-dev zlib1g-dev # optional (for nghttpx application): libbrotli-dev - ./configure --disable-dependency-tracking --prefix="$PWD"/build \ + ./configure --disable-dependency-tracking --prefix="$PWD"/build --enable-app --enable-http3 \ PKG_CONFIG_PATH=/home/runner/openssl/build/lib/pkgconfig:/home/runner/nghttp3/build/lib/pkgconfig:/home/runner/ngtcp2/build/lib/pkgconfig \ LDFLAGS=-Wl,-rpath,/home/runner/openssl/build/lib \ - --with-libbrotlienc --with-libbrotlidec \ - --enable-app --enable-http3 + --with-libbrotlienc --with-libbrotlidec make install linux: @@ -644,9 +644,9 @@ jobs: ${MATRIX_GENERATE} else mkdir bld && cd bld && ../configure --enable-warnings --enable-werror --enable-debug --disable-static \ + --disable-dependency-tracking --enable-option-checking=fatal \ --with-libuv \ --with-test-nghttpx=/home/runner/nghttp2/build/bin/nghttpx \ - --disable-dependency-tracking --enable-option-checking=fatal \ ${MATRIX_CONFIGURE} fi diff --git a/.github/workflows/linux-old.yml b/.github/workflows/linux-old.yml index 45f4234008..c548a186b2 100644 --- a/.github/workflows/linux-old.yml +++ b/.github/workflows/linux-old.yml @@ -158,9 +158,9 @@ jobs: run: | mkdir bld-am cd bld-am - ../configure --disable-dependency-tracking --enable-option-checking=fatal --enable-unity --enable-warnings --enable-werror --disable-shared \ - --without-ssl --enable-ares --without-libssh2 --with-zstd --with-gssapi --with-librtmp \ - --prefix="$PWD"/../curl-install-am + ../configure --prefix="$PWD"/../curl-install-am --enable-unity --enable-warnings --enable-werror --disable-shared \ + --disable-dependency-tracking --enable-option-checking=fatal \ + --without-ssl --enable-ares --without-libssh2 --with-zstd --with-gssapi --with-librtmp - name: 'AM configure log' if: ${{ !cancelled() }} diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 5a48dbf6a8..cf9fdd006a 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -538,8 +538,8 @@ jobs: --location "https://github.com/wolfSSL/wolfssl/archive/v${WOLFSSL_VERSION}-stable.tar.gz" | tar -xz cd "wolfssl-${WOLFSSL_VERSION}-stable" ./autogen.sh - ./configure --disable-dependency-tracking --enable-tls13 --enable-harden --enable-all \ - --disable-benchmark --disable-crypttests --disable-examples --prefix=/home/runner/wolfssl-all + ./configure --disable-dependency-tracking --prefix=/home/runner/wolfssl-all --enable-tls13 --enable-harden --enable-all \ + --disable-benchmark --disable-crypttests --disable-examples make install - name: 'cache wolfssl (opensslextra-intel)' # does support `OPENSSL_COEXIST` @@ -559,8 +559,8 @@ jobs: --location "https://github.com/wolfSSL/wolfssl/archive/v${WOLFSSL_VERSION}-stable.tar.gz" | tar -xz cd "wolfssl-${WOLFSSL_VERSION}-stable" ./autogen.sh - ./configure --disable-dependency-tracking --enable-tls13 --enable-harden --enable-ech --enable-opensslextra \ - --disable-benchmark --disable-crypttests --disable-examples --prefix=/home/runner/wolfssl-opensslextra + ./configure --disable-dependency-tracking --prefix=/home/runner/wolfssl-opensslextra --enable-tls13 --enable-harden --enable-ech --enable-opensslextra \ + --disable-benchmark --disable-crypttests --disable-examples make install - name: 'cache wolfssl (opensslextra-arm)' # does support `OPENSSL_COEXIST` @@ -580,8 +580,8 @@ jobs: --location "https://github.com/wolfSSL/wolfssl/archive/v${WOLFSSL_VERSION}-stable.tar.gz" | tar -xz cd "wolfssl-${WOLFSSL_VERSION}-stable" ./autogen.sh - ./configure --disable-dependency-tracking --enable-tls13 --enable-harden --enable-ech --enable-opensslextra \ - --disable-benchmark --disable-crypttests --disable-examples --prefix=/home/runner/wolfssl-opensslextra + ./configure --disable-dependency-tracking --prefix=/home/runner/wolfssl-opensslextra --enable-tls13 --enable-harden --enable-ech --enable-opensslextra \ + --disable-benchmark --disable-crypttests --disable-examples make install - name: 'cache mbedtls (latest-intel)' @@ -669,7 +669,7 @@ jobs: curl --disable --fail --silent --show-error --connect-timeout 15 --max-time 120 --retry 6 --retry-connrefused \ --location "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${OPENLDAP_VERSION}.tgz" | tar -xz cd "openldap-${OPENLDAP_VERSION}" - ./configure --enable-static --disable-shared --disable-slapd --prefix=/home/runner/openldap-static + ./configure --prefix=/home/runner/openldap-static --enable-static --disable-shared --disable-slapd make install - name: 'cache openssl (thread sanitizer)' diff --git a/.github/workflows/non-native.yml b/.github/workflows/non-native.yml index 3d0bb3410e..444ac0a99d 100644 --- a/.github/workflows/non-native.yml +++ b/.github/workflows/non-native.yml @@ -186,11 +186,10 @@ jobs: options='--disable-manual --disable-docs' # Slow with autotools, skip on emulated CPU fi mkdir bld && cd bld - time ../configure --enable-unity --enable-debug --enable-warnings --enable-werror --disable-static \ - --prefix="$HOME"/curl-install \ + time ../configure --prefix="$HOME"/curl-install --enable-unity --enable-debug --enable-warnings --enable-werror --disable-static \ + --disable-dependency-tracking --enable-option-checking=fatal \ --with-openssl \ --with-brotli --enable-ldap --enable-ldaps --with-libidn2 --with-libssh2 --with-nghttp2 --with-gssapi \ - --disable-dependency-tracking --enable-option-checking=fatal \ ${options} \ ${MATRIX_OPTIONS} \ || { tail -n 1000 config.log; false; } @@ -283,7 +282,8 @@ jobs: ${MATRIX_OPTIONS} else TOOLCHAIN="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64" - mkdir bld && cd bld && ../configure --disable-dependency-tracking --enable-option-checking=fatal --enable-unity --enable-warnings --enable-werror --disable-shared \ + mkdir bld && cd bld && ../configure --enable-unity --enable-warnings --enable-werror --disable-shared \ + --disable-dependency-tracking --enable-option-checking=fatal \ CC="$TOOLCHAIN/bin/aarch64-linux-android${MATRIX_PLATFORM}-clang" \ AR="$TOOLCHAIN/bin/llvm-ar" \ RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \ @@ -388,7 +388,8 @@ jobs: -DWATT_ROOT="$HOME/djgpp/net/watt" else autoreconf -fi - mkdir bld && cd bld && ../configure --disable-dependency-tracking --enable-option-checking=fatal --enable-unity --enable-warnings --enable-werror --disable-shared \ + mkdir bld && cd bld && ../configure --enable-unity --enable-warnings --enable-werror --disable-shared \ + --disable-dependency-tracking --enable-option-checking=fatal \ CC="$HOME/djgpp/bin/i586-pc-msdosdjgpp-gcc" \ AR="$HOME/djgpp/bin/i586-pc-msdosdjgpp-ar" \ RANLIB="$HOME/djgpp/bin/i586-pc-msdosdjgpp-ranlib" \ diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 940c8080c7..190b45dbfb 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -98,10 +98,9 @@ jobs: -DCURL_WERROR=ON \ ${MATRIX_CONFIG} else - mkdir bld && cd bld && ../configure --enable-unity --enable-warnings --enable-werror --disable-static \ - --prefix="$HOME"/curl-install \ - --with-libssh2 \ + mkdir bld && cd bld && ../configure --prefix="$HOME"/curl-install --enable-unity --enable-warnings --enable-werror --disable-static \ --disable-dependency-tracking --enable-option-checking=fatal \ + --with-libssh2 \ ${MATRIX_CONFIG} fi @@ -312,10 +311,9 @@ jobs: fi else export CFLAGS CPPFLAGS - mkdir bld && cd bld && ../configure --enable-unity --enable-warnings --enable-werror --disable-static \ - --prefix="$HOME"/curl-install \ - --with-libssh2 \ + mkdir bld && cd bld && ../configure --prefix="$HOME"/curl-install --enable-unity --enable-warnings --enable-werror --disable-static \ --disable-dependency-tracking --enable-option-checking=fatal \ + --with-libssh2 \ ${MATRIX_CONFIG} fi @@ -668,10 +666,10 @@ jobs: ${options} else mkdir bld && cd bld && ../configure --enable-unity --enable-warnings --enable-werror --disable-static \ + --disable-dependency-tracking --enable-option-checking=fatal \ --host="${TRIPLET}" \ --with-schannel --with-winidn \ - --without-libpsl \ - --disable-dependency-tracking --enable-option-checking=fatal + --without-libpsl fi - name: 'configure log'