pool/cmake
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fix incorrect requires on libuv1 on non-suse distributions

Browse Source 
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
This commit is contained in:
Dirk Mueller 2024-01-19 15:26:53 +00:00 committed by Git OBS Bridge
parent bd0a74fa85
commit ad37be2c04
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jan 19 15:26:23 UTC 2024 - Dirk Müller <dmueller@suse.com>
- fix incorrect requires on libuv1 on non-suse distributions
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 18 15:00:58 UTC 2024 - Ludwig Nussel <lnussel@suse.com> Thu Jan 18 15:00:58 UTC 2024 - Ludwig Nussel <lnussel@suse.com>
@ -26,7 +31,7 @@ Wed Dec 27 12:56:45 UTC 2023 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Re-add "-Wl,--no-undefined" linker flags for executables and - Re-add "-Wl,--no-undefined" linker flags for executables and
regular shared libraries. Shared library targets which are used regular shared libraries. Shared library targets which are used
as plugins/modules should use `add_library(... MODULE ...), which 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 <foss@grueninger.de> Thu Dec 14 21:06:23 UTC 2023 - Christoph G <foss@grueninger.de>
@ -76,7 +81,7 @@ Wed Nov 29 21:07:37 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>
even if they are inside the top-level source directory, now even if they are inside the top-level source directory, now
fixed. Clients must be updated to expect relative paths under fixed. Clients must be updated to expect relative paths under
the top-level source directory. 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 <dmueller@suse.com> Mon Nov 27 08:30:38 UTC 2023 - Dirk Müller <dmueller@suse.com>

12
cmake.spec
View File

@ -76,15 +76,13 @@ BuildRequires: pkgconfig(ncurses)
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
%if 0%{?suse_version} > 1500 %if 0%{?suse_version} > 1500
BuildRequires: pkgconfig(libuv) >= 1.28 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: # 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 # 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 %requires_eq libuv1
%endif %endif
%if "%{flavor}" == ""
Requires: cmake-implementation = %{version}
%endif
%if 0%{?suse_version} && 0%{?suse_version} <= 1500 %if 0%{?suse_version} && 0%{?suse_version} <= 1500
%define pyver 311 %define pyver 311
%else %else
@ -170,7 +168,9 @@ export CXXFLAGS="$CFLAGS"
%endif %endif
--parallel=0%{jobs} \ --parallel=0%{jobs} \
--verbose \ --verbose \
%if 0%{?suse_version} < 1550 %if 0%{?suse_version} > 1500
--system-libuv \
%else
--no-system-libuv \ --no-system-libuv \
%endif %endif
%if %{with qhelp} %if %{with qhelp}