From 07c60c120b4a339b015c6d1242f33266724c2e840f24c7d51d452cf7dd8c139b Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 23 Aug 2022 15:05:45 +0000 Subject: [PATCH 1/3] - add glibc-236.patch (bsc#1202208) OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=502 --- cmake.changes | 5 +++++ cmake.spec | 1 + glibc-236.patch | 13 +++++++++++++ 3 files changed, 19 insertions(+) create mode 100644 glibc-236.patch diff --git a/cmake.changes b/cmake.changes index 8111da6..e091a3b 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 23 15:05:13 UTC 2022 - Dirk Müller + +- add glibc-236.patch (bsc#1202208) + ------------------------------------------------------------------- Thu Aug 18 09:04:40 UTC 2022 - Paolo Stivanin diff --git a/cmake.spec b/cmake.spec index ce527df..1d73d26 100644 --- a/cmake.spec +++ b/cmake.spec @@ -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 diff --git a/glibc-236.patch b/glibc-236.patch new file mode 100644 index 0000000..a8e63fb --- /dev/null +++ b/glibc-236.patch @@ -0,0 +1,13 @@ +investigated under https://gitlab.kitware.com/cmake/cmake/-/issues/23881 + +--- cmake-3.24.1/Modules/GetPrerequisites.cmake ++++ cmake-3.24.1/Modules/GetPrerequisites.cmake +@@ -514,7 +514,7 @@ + string(TOLOWER "${resolved_file}" lower) + + if(UNIX) +- if(resolved_file MATCHES "^(/lib/|/lib32/|/libx32/|/lib64/|/usr/lib/|/usr/lib32/|/usr/libx32/|/usr/lib64/|/usr/X11R6/|/usr/bin/)") ++ if(resolved_file MATCHES "^(/lib/|/lib32/|/libx32/|/lib64/|/usr/lib/|/usr/lib32/|/usr/libx32/|/usr/lib64/|/usr/X11R6/|/usr/bin/|linux-vdso\.so)") + set(is_system 1) + endif() + endif() From fb770b7cbd47c3b4704bedaa8cc3eb53478854944ec7744024fcac1e7e9e12b6 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 24 Aug 2022 09:18:48 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=503 --- glibc-236.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glibc-236.patch b/glibc-236.patch index a8e63fb..69a7839 100644 --- a/glibc-236.patch +++ b/glibc-236.patch @@ -7,7 +7,7 @@ investigated under https://gitlab.kitware.com/cmake/cmake/-/issues/23881 if(UNIX) - if(resolved_file MATCHES "^(/lib/|/lib32/|/libx32/|/lib64/|/usr/lib/|/usr/lib32/|/usr/libx32/|/usr/lib64/|/usr/X11R6/|/usr/bin/)") -+ if(resolved_file MATCHES "^(/lib/|/lib32/|/libx32/|/lib64/|/usr/lib/|/usr/lib32/|/usr/libx32/|/usr/lib64/|/usr/X11R6/|/usr/bin/|linux-vdso\.so)") ++ if(resolved_file MATCHES "^(/lib/|/lib32/|/libx32/|/lib64/|/usr/lib/|/usr/lib32/|/usr/libx32/|/usr/lib64/|/usr/X11R6/|/usr/bin/|linux-vdso\\.so)") set(is_system 1) endif() endif() From da3833fe8584affec23371b5e7b1c529c980df551c24f0b9258774282eb9844a Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 24 Aug 2022 09:45:56 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=504 --- glibc-236.patch | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/glibc-236.patch b/glibc-236.patch index 69a7839..fa94353 100644 --- a/glibc-236.patch +++ b/glibc-236.patch @@ -2,12 +2,15 @@ investigated under https://gitlab.kitware.com/cmake/cmake/-/issues/23881 --- cmake-3.24.1/Modules/GetPrerequisites.cmake +++ cmake-3.24.1/Modules/GetPrerequisites.cmake -@@ -514,7 +514,7 @@ - string(TOLOWER "${resolved_file}" lower) - - if(UNIX) -- if(resolved_file MATCHES "^(/lib/|/lib32/|/libx32/|/lib64/|/usr/lib/|/usr/lib32/|/usr/libx32/|/usr/lib64/|/usr/X11R6/|/usr/bin/)") -+ if(resolved_file MATCHES "^(/lib/|/lib32/|/libx32/|/lib64/|/usr/lib/|/usr/lib32/|/usr/libx32/|/usr/lib64/|/usr/X11R6/|/usr/bin/|linux-vdso\\.so)") - set(is_system 1) - endif() - endif() +@@ -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")