testing/cmake
SHA256
3
0
Fork 0
forked from pool/cmake
Code Pull Requests Activity

Accepting request 999013 from devel:tools:building

Browse Source 
- add glibc-236.patch (bsc#1202208)

OBS-URL: https://build.opensuse.org/request/show/999013
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cmake?expand=0&rev=221
This commit is contained in:
Dominique Leuenberger 2022-08-25 13:33:09 +00:00 committed by Git OBS Bridge
commit c8400f8cd2
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Aug 23 15:05:13 UTC 2022 - Dirk Müller <dmueller@suse.com>
- add glibc-236.patch (bsc#1202208)
-------------------------------------------------------------------
Thu Aug 18 09:04:40 UTC 2022 - Paolo Stivanin <info@paolostivanin.com>

1
cmake.spec
View File

@ -64,6 +64,7 @@ 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-fix-png-include-dir.patch
Patch3: glibc-236.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: pkgconfig

16
glibc-236.patch Normal file
View File

@ -0,0 +1,16 @@
investigated under https://gitlab.kitware.com/cmake/cmake/-/issues/23881
--- cmake-3.24.1/Modules/GetPrerequisites.cmake
+++ cmake-3.24.1/Modules/GetPrerequisites.cmake
@@ -730,9 +730,9 @@ function(get_prerequisites target prereq
if(gp_tool MATCHES "ldd$")
set(gp_cmd_args "")
- set(gp_regex "^[\t ]*[^\t ]+ =>[\t ]+([^\t\(]+)( \(.+\))?${eol_char}$")
+ set(gp_regex "^[\t ]*[^\t ]+ =>[\t ]+(/[^\t\(]+)( \(.+\))?${eol_char}$")
set(gp_regex_error "not found${eol_char}$")
- set(gp_regex_fallback "^[\t ]*([^\t ]+) => ([^\t ]+).*${eol_char}$")
+ set(gp_regex_fallback "^[\t ]*([^\t ]+) => (/[^\t ]+).*${eol_char}$")
set(gp_regex_cmp_count 1)
elseif(gp_tool MATCHES "otool$")
set(gp_cmd_args "-L")