diff --git a/.github/scripts/compile.sh b/.github/scripts/compile.sh index 5adf1a4d7..1ab51c2a4 100755 --- a/.github/scripts/compile.sh +++ b/.github/scripts/compile.sh @@ -134,7 +134,7 @@ cmake -S "${PROTON_DIR}" -B "${PROTON_BUILD_DIR}" \ -DENABLE_LINKTIME_OPTIMIZATION=ON \ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ -DBUILD_TLS=ON -DSSL_IMPL=openssl -DBUILD_STATIC_LIBS=ON -DBUILD_BINDINGS=python \ - -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF \ + -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF \ -DCMAKE_INSTALL_PREFIX=${PROTON_BUILD_DIR}/install cmake --build "${PROTON_BUILD_DIR}" --verbose diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 239287fb5..ca1c6920c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -66,6 +66,7 @@ jobs: -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DBUILD_BINDINGS=python + -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF -DENABLE_FUZZ_TESTING=OFF @@ -444,6 +445,7 @@ jobs: -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DBUILD_BINDINGS=python -DPython_EXECUTABLE=/usr/bin/python3 + -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF -DENABLE_FUZZ_TESTING=OFF @@ -739,7 +741,7 @@ jobs: - name: Install qpid-proton run: | - cmake -S qpid-proton -B qpid-proton -GNinja -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_BINDINGS=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TLS=ON + cmake -S qpid-proton -B qpid-proton -GNinja -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_BINDINGS=OFF -DBUILD_TOOLS=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TLS=ON cmake --build qpid-proton sudo cmake --install qpid-proton @@ -789,6 +791,7 @@ jobs: -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DBUILD_BINDINGS=python -DPython_EXECUTABLE=/usr/bin/python3 + -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF -DENABLE_FUZZ_TESTING=OFF diff --git a/.github/workflows/clang-analyzer.yml b/.github/workflows/clang-analyzer.yml index 78ab1d4fe..590cd0967 100644 --- a/.github/workflows/clang-analyzer.yml +++ b/.github/workflows/clang-analyzer.yml @@ -64,7 +64,7 @@ jobs: - name: Install Proton run: | - cmake -S qpid-proton -B qpid-proton/install -DBUILD_BINDINGS=c -DBUILD_TLS=ON -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF + cmake -S qpid-proton -B qpid-proton/install -DBUILD_BINDINGS=c -DBUILD_TLS=ON -DBUILD_TOOLS=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF cmake --build qpid-proton/install sudo cmake --install qpid-proton/install diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index c12659dfa..3ef9b80e0 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -58,7 +58,7 @@ jobs: - name: Install Proton run: | - cmake -S qpid-proton -B qpid-proton/install -DBUILD_BINDINGS=c -DBUILD_TLS=ON -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF + cmake -S qpid-proton -B qpid-proton/install -DBUILD_BINDINGS=c -DBUILD_TLS=ON -DBUILD_TOOLS=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF cmake --build qpid-proton/install sudo cmake --install qpid-proton/install diff --git a/.github/workflows/gcc-fanalyzer.yml b/.github/workflows/gcc-fanalyzer.yml index 3bf39fdb8..5e9e84fd6 100644 --- a/.github/workflows/gcc-fanalyzer.yml +++ b/.github/workflows/gcc-fanalyzer.yml @@ -71,7 +71,7 @@ jobs: - name: Install Proton run: | - cmake -S qpid-proton -B qpid-proton/build -GNinja -DBUILD_BINDINGS=c -DBUILD_TLS=ON -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF + cmake -S qpid-proton -B qpid-proton/build -GNinja -DBUILD_BINDINGS=c -DBUILD_TLS=ON -DBUILD_TOOLS=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF cmake --build qpid-proton/build cmake --install qpid-proton/build diff --git a/packaging/skupper-router.spec b/packaging/skupper-router.spec index 6cd785799..4e83e8617 100644 --- a/packaging/skupper-router.spec +++ b/packaging/skupper-router.spec @@ -98,6 +98,7 @@ cd %{_builddir}/qpid-proton-%{proton_vendored_version} # PROTON-2473: -Wno-error=deprecated-declarations for DH_new, DH_... %__cmake . -B "%{__cmake_builddir}" \ -DCMAKE_C_FLAGS="$CFLAGS -Wno-error=deprecated-declarations" \ + -DBUILD_TOOLS=OFF \ -DBUILD_EXAMPLES=OFF \ -DBUILD_TESTING=OFF \ -DBUILD_BINDINGS=OFF \