From 00a1d89f7e88f6f34ba29e5206b28dc462470b605bc2d32fd8bf86990ebc3d2c Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Thu, 18 Jan 2024 12:22:02 +0000 Subject: [PATCH 1/4] Accepting request 1139691 from home:Thaodan:branches:devel:tools:building - macros: Set some more variables notable %{_docdir} so that GNUInstallDirs works fully on openSUSE. Packages using CMAKE_INSTALL_DOCDIR fail otherwise. OBS-URL: https://build.opensuse.org/request/show/1139691 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=566 --- cmake.changes | 6 ++++++ cmake.macros | 3 +++ cmake.spec | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/cmake.changes b/cmake.changes index 7a43dc0..6ebac68 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 17 19:54:04 UTC 2024 - Björn Bidar + +- macros: Set some more variables notable %{_docdir} so that GNUInstallDirs + works fully on openSUSE. Packages using CMAKE_INSTALL_DOCDIR fail otherwise. + ------------------------------------------------------------------- Thu Jan 11 10:21:03 UTC 2024 - Michal Suchanek diff --git a/cmake.macros b/cmake.macros index a1e312b..9241ec7 100644 --- a/cmake.macros +++ b/cmake.macros @@ -32,6 +32,9 @@ -DCMAKE_INSTALL_LIBDIR:PATH=%{__cmake_make_prefix_relative %{_libdir}} \\\ -DCMAKE_INSTALL_INCLUDEDIR:PATH=%{__cmake_make_prefix_relative %{_includedir}} \\\ -DCMAKE_INSTALL_DATAROOTDIR:PATH=%{__cmake_make_prefix_relative %{_datadir}} \\\ + -DCMAKE_INSTALL_DOCDIR:PATH=%{__cmake_make_prefix_relative %{_docdir}/%{name}} \\\ + -DCMAKE_INSTALL_MANDIR:PATH=%{__cmake_make_prefix_relative %{_mandir}} \\\ + -DCMAKE_INSTALL_INFODIR:PATH=%{__cmake_make_prefix_relative %{_infodir}} \\\ -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\ -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\ diff --git a/cmake.spec b/cmake.spec index 0004479..238e965 100644 --- a/cmake.spec +++ b/cmake.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From bd0a74fa855e3c47c8f6c72b66426e8c7ce219152074015c2a420b0d6c15f632 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 19 Jan 2024 09:12:43 +0000 Subject: [PATCH 2/4] Accepting request 1139746 from home:lnussel:branches:devel:tools:building - Revert "-Wl,--no-undefined" as it still breaks packages (boo#1218620) OBS-URL: https://build.opensuse.org/request/show/1139746 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=567 --- cmake.changes | 5 +++++ cmake.macros | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cmake.changes b/cmake.changes index 6ebac68..859a45c 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 18 15:00:58 UTC 2024 - Ludwig Nussel + +- Revert "-Wl,--no-undefined" as it still breaks packages (boo#1218620) + ------------------------------------------------------------------- Wed Jan 17 19:54:04 UTC 2024 - Björn Bidar diff --git a/cmake.macros b/cmake.macros index 9241ec7..15d6ce9 100644 --- a/cmake.macros +++ b/cmake.macros @@ -43,9 +43,9 @@ -DCMAKE_C_FLAGS="${CFLAGS:-%optflags}" \\\ -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags}" \\\ -DCMAKE_Fortran_FLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" \\\ - -DCMAKE_EXE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \\\ + -DCMAKE_EXE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,-z,now" \\\ -DCMAKE_MODULE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed" \\\ - -DCMAKE_SHARED_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \\\ + -DCMAKE_SHARED_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,-z,now" \\\ %if "%{?_lib}" == "lib64" \ -DLIB_SUFFIX=64 \\\ %endif \ From ad37be2c04eaa2c813237b961811aa4aea1d0b5e974356f7b584d6afc16a1abd Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 19 Jan 2024 15:26:53 +0000 Subject: [PATCH 3/4] - 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} From 5e987191a70a03e2346a7dd78c59d2b9944a51709961a9228cd4c91585cf1fdc Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Thu, 15 Feb 2024 06:21:56 +0000 Subject: [PATCH 4/4] Accepting request 1146626 from home:fstrba:branches:devel:tools:building Fix detection of libjvm of ZERO JVM OBS-URL: https://build.opensuse.org/request/show/1146626 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=569 --- cmake-zerojvm.patch | 10 ++++++++++ cmake.changes | 8 ++++++++ cmake.spec | 3 ++- 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 cmake-zerojvm.patch diff --git a/cmake-zerojvm.patch b/cmake-zerojvm.patch new file mode 100644 index 0000000..d413d6c --- /dev/null +++ b/cmake-zerojvm.patch @@ -0,0 +1,10 @@ +--- cmake-3.28.1/Modules/FindJNI.cmake 2024-02-14 13:10:42.173018608 +0100 ++++ cmake-3.28.1/Modules/FindJNI.cmake 2024-02-14 17:43:00.956527142 +0100 +@@ -344,6 +344,7 @@ + "${dir}" + "${dir}/client" + "${dir}/server" ++ "${dir}/zero" + # IBM SDK, Java Technology Edition, specific paths + "${dir}/j9vm" + "${dir}/default" diff --git a/cmake.changes b/cmake.changes index 02c917d..8b8f9b4 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Feb 14 16:46:22 UTC 2024 - Fridrich Strba + +- Added patch: + * cmake-zerojvm.patch + + fix JVM detection on JDKs with ZERO virtual machine, like + java-21-openjdk for armv6l + ------------------------------------------------------------------- Fri Jan 19 15:26:23 UTC 2024 - Dirk Müller diff --git a/cmake.spec b/cmake.spec index c5fe8d7..3e6e75d 100644 --- a/cmake.spec +++ b/cmake.spec @@ -1,5 +1,5 @@ # -# spec file +# spec file for package cmake # # Copyright (c) 2024 SUSE LLC # @@ -63,6 +63,7 @@ Source99: README.SUSE Patch0: cmake-fix-ruby-test.patch # Search for python interpreters from newest to oldest rather then picking up /usr/bin/python as first choice Patch1: feature-suse-python-interp-search-order.patch +Patch2: cmake-zerojvm.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkgconfig