From 6898491c0f9da96fdb4ae1ab959a29f2227cf14e Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Sun, 12 Oct 2025 14:36:58 +0800 Subject: [PATCH] fix build with ninja --- poco.spec | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/poco.spec b/poco.spec index a0dc0eb..dc232c9 100644 --- a/poco.spec +++ b/poco.spec @@ -19,7 +19,7 @@ Name: poco Version: 1.12.4 -Release: 3 +Release: 4 Summary: C++ class libraries for network-centric applications License: BSL-1.0 @@ -135,28 +135,34 @@ rm -v XML/src/xmltok_ns.c %if %{without mongodb} %global poco_mongodb -DENABLE_MONGODB=OFF %endif -%cmake -DPOCO_UNBUNDLED=ON %{?poco_tests} %{?poco_mongodb} -DENABLE_REDIS=OFF -DODBC_INCLUDE_DIR=%{_includedir}/libiodbc -B %{cmake_build_dir} -%make_build -C %{cmake_build_dir} -%cmake -DPOCO_UNBUNDLED=ON %{?poco_tests} %{?poco_mongodb} -DENABLE_REDIS=OFF -DODBC_INCLUDE_DIR=%{_includedir}/libiodbc -DCMAKE_BUILD_TYPE=Debug -B %{cmake_debug_dir} -%make_build -C %{cmake_debug_dir} + +%define _vpath_builddir %{cmake_build_dir} +%cmake -DPOCO_UNBUNDLED=ON %{?poco_tests} %{?poco_mongodb} -DENABLE_REDIS=OFF -DODBC_INCLUDE_DIR=%{_includedir}/libiodbc +%cmake_build + +%define _vpath_builddir %{cmake_debug_dir} +%cmake -DPOCO_UNBUNDLED=ON %{?poco_tests} %{?poco_mongodb} -DENABLE_REDIS=OFF -DODBC_INCLUDE_DIR=%{_includedir}/libiodbc -DCMAKE_BUILD_TYPE=Debug +%cmake_build %install -%make_install -C %{cmake_debug_dir} -%make_install -C %{cmake_build_dir} +%define _vpath_builddir %{cmake_build_dir} +%cmake_install + +%define _vpath_builddir %{cmake_debug_dir} +%cmake_install # conflict with arc rm -v %{buildroot}%{_bindir}/arc %check %if %{with tests} export POCO_BASE="$(pwd)" -pushd %{cmake_build_dir} +%define _vpath_builddir %{cmake_build_dir} %ifarch s390x # NetSSL test timed out on s390x -ctest -V %{?_smp_mflags} -E "MongoDB|Redis|DataMySQL|DataODBC|NetSSL" +%ctest -V %{?_smp_mflags} -E "MongoDB|Redis|DataMySQL|DataODBC|NetSSL" %else -ctest -V %{?_smp_mflags} -E "MongoDB|Redis|DataMySQL|DataODBC" +%ctest -V %{?_smp_mflags} -E "MongoDB|Redis|DataMySQL|DataODBC" %endif -popd %endif # ----------------------------------------------------------------------------- @@ -472,6 +478,9 @@ HTML format. %doc README NEWS LICENSE CONTRIBUTORS CHANGELOG doc/* %changelog +* Sun Oct 12 2025 Funda Wang - 1.12.4-4 +- fix build with ningja + * Sat Aug 23 2025 Funda Wang - 1.12.4-3 - deal with upcoming LIB_SUFFIX removal -- Gitee