Accepting request 822549 from devel:tools:building

OBS-URL: https://build.opensuse.org/request/show/822549 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cmake?expand=0&rev=178
2020-07-26 14:17:35 +00:00 · 2020-07-26 14:17:35 +00:00 · 5cdf73b923
commit 5cdf73b923
parent 3d14c77c66 8f70e89d4e
11 changed files with 129 additions and 68 deletions
--- a/cmake-3.17.3-SHA-256.txt
+++ b/cmake-3.17.3-SHA-256.txt
@ -1,10 +0,0 @@
-3cc6538f000e010e0002dc2d27d93f6a6f071218a3044808bdb6db98228b32ba  cmake-3.17.3-Darwin-x86_64.dmg
-2ad1413510681b041ec305923c6ccbc64b0fed6608df82f5543577f7b4b88305  cmake-3.17.3-Darwin-x86_64.tar.gz
-1a99f573512793224991d24ad49283f017fa544524d8513667ea3cb89cbe368b  cmake-3.17.3-Linux-x86_64.sh
-da8093956f0b4ae30293c9db498da9bdeaeea4e7a2b1f2d1637ddda064d06dd0  cmake-3.17.3-Linux-x86_64.tar.gz
-84858b7bdda0d30d372104bcc70635f1b30895f5bece1d85f5598411d13231d9  cmake-3.17.3-win32-x86.msi
-1a7d82fe79b295461e8fe91e6d3d97a43c01cf954426c8b10a108575c1aa4ee1  cmake-3.17.3-win32-x86.zip
-1ad34c10f792d952c179708c114e01ef6411520a82182abe393b54cff558926c  cmake-3.17.3-win64-x64.msi
-8a02de221aa96c236a947b28ca1bd6327b9bb82fa74b91e5caa49ffd6a642ae2  cmake-3.17.3-win64-x64.zip
-0bd60d512275dc9f6ef2a2865426a184642ceb3761794e6b65bff233b91d8c40  cmake-3.17.3.tar.gz
-e34320e1c896b8ee9fc627a20f5271db7c08691f769874d294bf9f54aa79b352  cmake-3.17.3.zip
--- a/cmake-3.17.3-SHA-256.txt.asc
+++ b/cmake-3.17.3-SHA-256.txt.asc
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAl7Pp3UACgkQLSzvEDSS
-FoSV7hAAoBhocG5fhk1WDoperYCx6haIIXfVuDrNhEu9v8jz43iXE17r8iCgG7T2
-UEIW92wj/IaEjYbwjLS7hYOFyMqs2Yr9Js3ncNBCXAgYuZzdZq2BmWCyfX4GlmC1
-9XrvxqMAseT1RLXOEenHaUun6f7kQtvoz2ALFnNUQObAxXZXtWt8+CVDk6D4n4vW
-93zolNrN4qv4tDA5ZRa0Wp+nUr25/8a/vPfhwBcZj4C8DvErah5/gJQ8fRMLkUUb
-+stuLxfRIc797kq76htuWSuz+rhPb3c3+ww3toiERduO67a/kPS+jaMPbMkNp6lq
-YTDSO2mUn0B5Qp4fWWqimkRKvY/TIgzcc2IBcdC0GS1sLFaC9fi7D5X1TR2lmaBv
-bsIEiXNCp3Q64TEo4y3IBqAdGQ1OTy1xfJEetacR3KdWC94PEMrSckltrFKBieB4
-cuL05SIihqol82uYHae3MwcmRWtJNDEfHe/p0ac3dMPxxCZ8vARm9751GScPvkvq
-5tdgIZmbxb+AxhWAPA6IQjmHlE9AQc4q/ct3S31LSVVjs1ZVvjYvOdkS3MtSdoy+
-Pfv1GRFbZncwxG27aZFqjqzRTvGK8b+kP7afcTK+34sarqcuSc6/2l+0Y7xuBdKE
-eB7HcSMbWWgGRhlQ0BLP6RoNtKPN89Y2rONJBks9hhIWahwMF2E=
-=ykzi
-----END PGP SIGNATURE-----
--- a/cmake-3.17.3.tar.gz
+++ b/cmake-3.17.3.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0bd60d512275dc9f6ef2a2865426a184642ceb3761794e6b65bff233b91d8c40
-size 9470753
--- a/cmake-3.18.0-SHA-256.txt
+++ b/cmake-3.18.0-SHA-256.txt
@ -0,0 +1,10 @@
+3cd3893675d345f0d5a5e8895f0f346ad2ad1688b78f9d5f6ea0a85555786204  cmake-3.18.0-Darwin-x86_64.dmg
+eb68a0d8c28faae347135c34594ff0591c7adaf5a23bafb5a640273af741955c  cmake-3.18.0-Darwin-x86_64.tar.gz
+a417f70d146bb4811dfe11c2ad15487f3c84e64f435c82aea7913496a1464788  cmake-3.18.0-Linux-x86_64.sh
+4d9a9d3351161073a67e49366d701b6fa4b0343781982dc5eef08a02a750d403  cmake-3.18.0-Linux-x86_64.tar.gz
+a59b9f77809dd40dce0df44fe7437deecd289264f3738d9294183ce56766f00e  cmake-3.18.0-win32-x86.msi
+8cc217b2cb01a69ce0c735d77a2d4e96199d6694452bbb43ea43696bf80e7daa  cmake-3.18.0-win32-x86.zip
+1597eef91b39fe4b34bab506158e34aa3a89490c519c97ac75a7c5d45885e345  cmake-3.18.0-win64-x64.msi
+a00307a70d5dd133d6788915f2c6ea4b1946bf3a1eb06a686b088a65cfe7c0d6  cmake-3.18.0-win64-x64.zip
+83b4ffcb9482a73961521d2bafe4a16df0168f03f56e6624c419c461e5317e29  cmake-3.18.0.tar.gz
+07f936f086de545b058069d46d2b3e41a2ef4d5071f3d1e4f02ea772f843867a  cmake-3.18.0.zip
--- a/cmake-3.18.0-SHA-256.txt.asc
+++ b/cmake-3.18.0-SHA-256.txt.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAl8O9QwACgkQLSzvEDSS
+FoTMmQ//UM12NhGCOl716++TZiRpN0ffNY9E7DNBeCROr+eoGk+Wlqnl7bf8B3UA
+QL6FtE/82mGEw8qPJiARJuAjpNLwobUyZx2hTkw9O002NK8hPk4mIuLm8DBu51eA
+W2TN9A5njcgiaYt1GAyoWyIDs+uqkwexNh3r3Incykb7eaZjmNzls6+AI+hOdzjc
+NWF8Fdslsau9Vbfkyjru9UcDaPPA/380jit1xOuKnZx+hJEguEkjLrq+xIXm0/Hl
+N5n2I3kcmFNFsRD1+ryMU8Mr3RBVH1cdGbXb5z7Len1qM8OJcT9XxbllYZoau6Cu
+BKjlZrnLIANf1ZYgVxDhd04PHefjLmAb1ulO8XVXd0Pn+2Yv/8NYIl/rYK7eJD+Y
+eXEknVf9PnJR0GEO/yCDpseon59u+ifU+Ig47GiDOPhTDeGCDjZX6EUFrV/xtghK
+8E4WU6XwyavLlCSoE35pzOW8ZQPmBycPLLbo/d6Sy1kpnEnaiRFtC40LN0aFuflM
+lu2vY1XePpUjAjdOBOQTif+/lwW+HeONWeuHrMcphpAQ5b+YOT9sJc/PHZcjBYMh
+ZM9j6kxHayDCTE5m4Bn4VcSosuQPd5D/wxMogDTbrPl4CFIHDgLXYVvhcqEWynQJ
+In8L9Cotd8Pxn7mhRQ7YGcPL9j/6a9mbhBDnpjQfSC8Kzh9bGtk=
+=KZ17
+-----END PGP SIGNATURE-----
--- a/cmake-3.18.0.tar.gz
+++ b/cmake-3.18.0.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:83b4ffcb9482a73961521d2bafe4a16df0168f03f56e6624c419c461e5317e29
+size 8970116
--- a/cmake-fix-ruby-test.patch
+++ b/cmake-fix-ruby-test.patch
@ -2,12 +2,12 @@ Index: b/Modules/FindRuby.cmake
 ===================================================================
 --- a/Modules/FindRuby.cmake
 +++ b/Modules/FindRuby.cmake
-@@ -111,7 +111,7 @@
-   _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
+@@ -290,7 +290,7 @@
+   _RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR)
 
   # vendor_ruby available ?
-  execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'"
-+  execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print 'true' unless RbConfig::CONFIG['vendorarchdir'].nil?"
-     OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY  ERROR_QUIET)
+-  execute_process(COMMAND ${Ruby_EXECUTABLE} -r vendor-specific -e "print 'true'"
+  execute_process(COMMAND ${Ruby_EXECUTABLE} -r rbconfig -e "print 'true' unless RbConfig::CONFIG['vendorarchdir'].nil?"
+     OUTPUT_VARIABLE Ruby_HAS_VENDOR_RUBY  ERROR_QUIET)
 
-   if(RUBY_HAS_VENDOR_RUBY)
+   if(Ruby_HAS_VENDOR_RUBY)
--- a/cmake.changes
+++ b/cmake.changes
@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Thu Jul 23 10:38:42 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Install the rpm provides handler to the correct location
+  (%{_rpmconfigdir, not %{_libexecdir}).
+
+-------------------------------------------------------------------
+Thu Jul 16 15:36:16 UTC 2020 - Christoph G <foss@grueninger.de>
+
+- update to cmake 3.18.0
+  * The “CUDA” language can now be compiled using Clang on non-Windows platforms.
+  * “cmake(1)” gained support for profiling of CMake scripts
+  * The “cmake_language()” command was added for meta-operations on
+    scripted or built-in commands, starting with a mode to “CALL” other
+    commands, and “EVAL CODE” to inplace evaluate a CMake script.
+  * The “find_program()”, “find_library()”, “find_path()” and
+    “find_file()” commands gained a new “REQUIRED” option that will stop
+    processing with an error message if nothing is found.
+  * The “CheckLinkerFlag” module has been added to provide a facility to
+    check validity of link flags.
+  * “ccmake(1)” learned to read a “CCMAKE_COLORS” environment variable
+    to customize colors.
+- Drop patch lua54.patch, it became part of upstream
+- Udjust patch cmake-fix-ruby-test.patch
+- Add patch no-system-nghttp2.patch which will become part of 3.18.1
+  to disable nghttp2 from system for cmake-mini
+
 -------------------------------------------------------------------
 Wed Jul  8 20:06:07 UTC 2020 - Matej Cepl <mcepl@suse.com>

--- a/cmake.spec
+++ b/cmake.spec
@ -35,9 +35,9 @@
 %else
 %bcond_with full
 %endif
-%define shortversion 3.17
+%define shortversion 3.18
 Name:           cmake%{?psuffix}
-Version:        3.17.3
+Version:        3.18.0
 Release:        0
 Summary:        Cross-platform make system
 License:        BSD-3-Clause
@ -55,9 +55,8 @@ 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
-# PATCH-FIX-UPSTREAM lua54.patch https://gitlab.kitware.com/cmake/cmake/-/issues/20933 mcepl@suse.com
-# Add Lua 5.4 among allowed versions of the Lua interpreter.
-Patch3:         lua54.patch
+# Adding flag --no-system-nghttp2, will become part of 3.18.1
+Patch3:         no-system-nghttp2.patch
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig
@ -132,6 +131,7 @@ export CXXFLAGS="%{optflags}"
    --system-libs \
 %if %{with mini}
    --no-system-curl \
+    --no-system-nghttp2 \
    --no-system-jsoncpp \
    --no-system-libarchive \
    --no-system-zstd \
@ -160,6 +160,9 @@ rm -rf %{buildroot}%{_bindir}/{cpack,cmake,ctest,ccmake}
 rm -rf %{buildroot}%{_datadir}/cmake
 rm -rf %{buildroot}%{_datadir}/aclocal/cmake.m4
 rm -rf %{buildroot}%{_docdir}/cmake
+rm -rf %{buildroot}%{_datadir}/bash-completion/completions/{cmake,cpack,ctest}
+rm -rf %{buildroot}%{_datadir}/emacs/site-lisp/cmake-mode.el
+rm -rf %{buildroot}%{_datadir}/vim/
 %else

 find %{buildroot}%{_datadir}/cmake -type f -print0 | xargs -0 chmod 644
@ -167,20 +170,9 @@ find %{buildroot}%{_datadir}/cmake -type f -print0 | xargs -0 chmod 644
 install -m644 %{SOURCE1} -D %{buildroot}%{_rpmconfigdir}/macros.d/macros.cmake

 # RPM auto provides
-install -p -m0644 -D %{SOURCE3} %{buildroot}%{_libexecdir}/rpm/fileattrs/cmake.attr
-install -p -m0755 -D %{SOURCE4} %{buildroot}%{_libexecdir}/rpm/cmake.prov
+install -p -m0644 -D %{SOURCE3} %{buildroot}%{_fileattrsdir}/cmake.attr
+install -p -m0755 -D %{SOURCE4} %{buildroot}%{_rpmconfigdir}/cmake.prov

-# Install bash completion symlinks
-mkdir -p %{buildroot}%{_datadir}/bash-completion/completions
-for f in %{buildroot}%{_datadir}/cmake/completions/*
-do
-  ln -s ../../cmake/completions/$(basename $f) %{buildroot}%{_datadir}/bash-completion/completions
-done
-
-# cmake-mode.el
-%define cmake_mode_el %{_datadir}/emacs/site-lisp/cmake-mode.el
-install -D -p -m 0644 Auxiliary/cmake-mode.el %{buildroot}%cmake_mode_el
-rm %{buildroot}%{_datadir}/cmake/editors/emacs/cmake-mode.el
 # fix: W: files-duplicate  (%%license covers already)
 rm %{buildroot}%{_docdir}/cmake/Copyright.txt

@ -223,7 +215,8 @@ rm %{buildroot}%{_docdir}/cmake/Copyright.txt
 %license Copyright.txt
 %doc README.rst
 %{_rpmconfigdir}/macros.d/macros.cmake
-%{_libexecdir}/rpm
+%{_fileattrsdir}/cmake.attr
+%{_rpmconfigdir}/cmake.prov
 %{_bindir}/cpack
 %{_bindir}/cmake
 %{_bindir}/ctest
@ -233,9 +226,18 @@ rm %{buildroot}%{_docdir}/cmake/Copyright.txt
 %dir %{_datadir}/aclocal
 %{_datadir}/aclocal/cmake.m4
 %doc %{_docdir}/cmake
-%{_datadir}/bash-completion
-%cmake_mode_el
-%dir %{dirname:%cmake_mode_el}
+%dir %{_datadir}/bash-completion
+%dir %{_datadir}/bash-completion/completions
+%{_datadir}/bash-completion/completions/{cmake,cpack,ctest}
+%dir %{_datadir}/emacs
+%dir %{_datadir}/emacs/site-lisp
+%{_datadir}/emacs/site-lisp/cmake-mode.el
+%dir %{_datadir}/vim
+%dir %{_datadir}/vim/vimfiles
+%dir %{_datadir}/vim/vimfiles/indent
+%{_datadir}/vim/vimfiles/indent/cmake.vim
+%dir %{_datadir}/vim/vimfiles/syntax
+%{_datadir}/vim/vimfiles/syntax/cmake.vim
 %endif
 %endif

--- a/lua54.patch
+++ b/lua54.patch
@ -1,11 +0,0 @@
--- a/Modules/FindLua.cmake
-+++ b/Modules/FindLua.cmake
-@@ -48,7 +48,7 @@ unset(_lua_append_versions)
- 
- # this is a function only to have all the variables inside go away automatically
- function(_lua_get_versions)
-    set(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
-+    set(LUA_VERSIONS5 5.4 5.3 5.2 5.1 5.0)
- 
-     if (Lua_FIND_VERSION_EXACT)
-         if (Lua_FIND_VERSION_COUNT GREATER 1)
--- a/no-system-nghttp2.patch
+++ b/no-system-nghttp2.patch
@ -0,0 +1,43 @@
+From 64bc82bb4dd80843f828602f33fd5255fb8d4d94 Mon Sep 17 00:00:00 2001
+From: Brad King <brad.king@kitware.com>
+Date: Mon, 20 Jul 2020 10:12:46 -0400
+Subject: [PATCH] bootstrap: Add options to control use of system nghttp2
+
+Add `bootstrap` options needed since commit 0b872fd4be (nghttp2: Build
+the library within CMake for use by our curl, 2020-04-01,
+v3.18.0-rc1~408^2~2).
+
+Fixes: #20987
+---
+ bootstrap | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/bootstrap b/bootstrap
+index fe7b2ad51b..18ab0737dc 100755
+--- a/bootstrap
+++ b/bootstrap
+@@ -622,6 +622,8 @@ Configuration:
+   --no-system-bzip2       use cmake-provided bzip2 library (default)
+   --system-liblzma        use system-installed liblzma library
+   --no-system-liblzma     use cmake-provided liblzma library (default)
+  --system-nghttp2        use system-installed nghttp2 library
+  --no-system-nghttp2     use cmake-provided nghttp2 library (default)
+   --system-zstd           use system-installed zstd library
+   --no-system-zstd        use cmake-provided zstd library (default)
+   --system-libarchive     use system-installed libarchive library
+@@ -866,10 +868,10 @@ while test $# != 0; do
+   --init=*) cmake_init_file=`cmake_arg "$1"` ;;
+   --system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=1" ;;
+   --no-system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=0" ;;
+-  --system-bzip2|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma|--system-zstd|--system-libuv)
+  --system-bzip2|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma|--system-nghttp2|--system-zstd|--system-libuv)
+     lib=`cmake_arg "$1" "--system-"`
+     cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=1" ;;
+-  --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-librhash|--no-system-zlib|--no-system-liblzma|--no-system-zstd|--no-system-libuv)
+  --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-librhash|--no-system-zlib|--no-system-liblzma|--no-system-nghttp2|--no-system-zstd|--no-system-libuv)
+     lib=`cmake_arg "$1" "--no-system-"`
+     cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=0" ;;
+   --qt-gui) cmake_bootstrap_qt_gui="1" ;;
+-- 
+GitLab
+