From ad37be2c04eaa2c813237b961811aa4aea1d0b5e974356f7b584d6afc16a1abd Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 19 Jan 2024 15:26:53 +0000 Subject: [PATCH] - fix incorrect requires on libuv1 on non-suse distributions uses the "CMAKE_MODULE_LINKER_FLAGS". * Fortran: Revert 3.27.0 change to module dependency scanning OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=568 --- cmake.changes | 9 +++++++-- cmake.spec | 12 ++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/cmake.changes b/cmake.changes index 859a45c..02c917d 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 19 15:26:23 UTC 2024 - Dirk Müller + +- fix incorrect requires on libuv1 on non-suse distributions + ------------------------------------------------------------------- Thu Jan 18 15:00:58 UTC 2024 - Ludwig Nussel @@ -26,7 +31,7 @@ Wed Dec 27 12:56:45 UTC 2023 - Stefan Brüns - Re-add "-Wl,--no-undefined" linker flags for executables and regular shared libraries. Shared library targets which are used as plugins/modules should use `add_library(... MODULE ...), which - uses the "CMAKE_MODULE_LINKER_FLAGS". + uses the "CMAKE_MODULE_LINKER_FLAGS". ------------------------------------------------------------------- Thu Dec 14 21:06:23 UTC 2023 - Christoph G @@ -76,7 +81,7 @@ Wed Nov 29 21:07:37 UTC 2023 - Andreas Stieger even if they are inside the top-level source directory, now fixed. Clients must be updated to expect relative paths under the top-level source directory. - * Fortran: Revert 3.27.0 change to module dependency scanning + * Fortran: Revert 3.27.0 change to module dependency scanning ------------------------------------------------------------------- Mon Nov 27 08:30:38 UTC 2023 - Dirk Müller diff --git a/cmake.spec b/cmake.spec index 238e965..c5fe8d7 100644 --- a/cmake.spec +++ b/cmake.spec @@ -76,15 +76,13 @@ BuildRequires: pkgconfig(ncurses) BuildRequires: pkgconfig(zlib) %if 0%{?suse_version} > 1500 BuildRequires: pkgconfig(libuv) >= 1.28 -%endif -%if "%{flavor}" == "" -Requires: cmake-implementation = %{version} -%endif -%if %{with full} # Needs a rebuild as libuv will otherwise abort the program with: # fatal error: libuv version too new: running with libuv 1.X+1 when compiled with libuv 1.X will lead to libuv failures %requires_eq libuv1 %endif +%if "%{flavor}" == "" +Requires: cmake-implementation = %{version} +%endif %if 0%{?suse_version} && 0%{?suse_version} <= 1500 %define pyver 311 %else @@ -170,7 +168,9 @@ export CXXFLAGS="$CFLAGS" %endif --parallel=0%{jobs} \ --verbose \ -%if 0%{?suse_version} < 1550 +%if 0%{?suse_version} > 1500 + --system-libuv \ +%else --no-system-libuv \ %endif %if %{with qhelp}