Accepting request 687378 from home:mathletic:branches:devel:tools:building
- update to 3.14.0 OBS-URL: https://build.opensuse.org/request/show/687378 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=357
This commit is contained in:
parent
9cee3988cc
commit
557e7fbd11
@ -1,11 +0,0 @@
|
||||
411c480b0f179054c26c4f854b2761b1fbbbe18c7c142f6554b0b363b4c21eaa cmake-3.13.4-Darwin-x86_64.dmg
|
||||
fef537614d73fda848f6168273b6c7ba45f850484533361e7bc50ac1d315f780 cmake-3.13.4-Darwin-x86_64.tar.gz
|
||||
a3265957ef8784a89e2f71164273cce7cbbf3f1d4a98227bc31557ab889681c2 cmake-3.13.4-Linux-x86_64.sh
|
||||
563a39e0a7c7368f81bfa1c3aff8b590a0617cdfe51177ddc808f66cc0866c76 cmake-3.13.4-Linux-x86_64.tar.gz
|
||||
7c37235ece6ce85aab2ce169106e0e729504ad64707d56e4dbfc982cb4263847 cmake-3.13.4-win32-x86.msi
|
||||
28daf772f55d817a13ef14e25af2a5569f8326dac66a6aa3cc5208cf1f8e943f cmake-3.13.4-win32-x86.zip
|
||||
64ac7dd5411b48c2717e15738b83ea0d4347cd51b940487dff7f99a870656c09 cmake-3.13.4-win64-x64.msi
|
||||
bcd477d49e4a9400b41213d53450b474beaedb264631693c958ef9affa8e5623 cmake-3.13.4-win64-x64.zip
|
||||
a4d081bdc49fa25b0913d602a9be8be462bb2fc246926b553d97e52fb0a1b56e cmake-3.13.4.tar.Z
|
||||
fdd928fee35f472920071d1c7f1a6a2b72c9b25e04f7a37b409349aef3f20e9b cmake-3.13.4.tar.gz
|
||||
fcde2bd40241b90d9806fb1db52972a80f727f3a156c29f9514b16f4004799d7 cmake-3.13.4.zip
|
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAlxUXWcACgkQLSzvEDSS
|
||||
FoSIOg//XfPqFpCwykfeDkWasQrlG1pzV4qNwvQgb72dAHX0HoVnpa7BaYInq7bc
|
||||
6hCaftetAPyCiAJSXgsUa6y4x3inVLfre1eiQzffUF4AA9U7CBa1GTSZDGg7UQ86
|
||||
tkan1ADVNON8ppBvl0kPemx/PzVqroqjsUyUdRV3DPJk9q7ECWBIOhe5qr28aCMu
|
||||
ofC8taKJ+znG/98yKrWqX4FzDtaxQHH5NxcWe4M7pIXV3CxQn5XMTuxcFBMnNWWm
|
||||
t15DqbjwTZlpXHLUJSvAkYkryo6WW2i12LLWhg8YbYrToZM8scticx10uZn7GxK9
|
||||
NLcyamvlXFMQs0TF6XcxeB1Aq175NPV6e179wrYFIBqdFQm9jr4vsCa5Qg4s9N6k
|
||||
U5cSrgUb4/3Ta3fq1pHmWrbyDJ0FWfbQuMRTEcKwbw8nWPN1HD4z3SL4gV7ifgYK
|
||||
SDBX7JME6uJr4iss1FKghToPj2GQZ0ggLDXuXUjBxxBAG15GVCDmZo0dm9+1Phu/
|
||||
drPCezNPVxap7C9PZzu3y0rYOjs5azzux93VgkwWI8u8hBPp/Yq9eRNDVAW+b+kC
|
||||
DY7z484ZiiwlRqCabfPqu226PYVKGL8IcqGsKF3x03wOnUy1JU58z7/PkfBI3gSg
|
||||
EDk4NMkuvSJ7dHzmZRgW0/AKjZMiVPHtkcp4wMf83W/DMaBYnxU=
|
||||
=yOm3
|
||||
-----END PGP SIGNATURE-----
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fdd928fee35f472920071d1c7f1a6a2b72c9b25e04f7a37b409349aef3f20e9b
|
||||
size 8617881
|
11
cmake-3.14.0-SHA-256.txt
Normal file
11
cmake-3.14.0-SHA-256.txt
Normal file
@ -0,0 +1,11 @@
|
||||
97f34f3ce6657a65c5232bfc1ecea41c8e7bf084d35ce5a43c58f02b97143771 cmake-3.14.0-Darwin-x86_64.dmg
|
||||
a02ad0d5b955dfad54c095bd7e937eafbbbfe8a99860107025cc442290a3e903 cmake-3.14.0-Darwin-x86_64.tar.gz
|
||||
7f3e227cfd9804ee9931490a83cb7029991bc73573ceb1c8ba11714775e8c334 cmake-3.14.0-Linux-x86_64.sh
|
||||
91dc9af7345e458eb10c853aa875e591efb7079a045641685ddec8d973c2b2bc cmake-3.14.0-Linux-x86_64.tar.gz
|
||||
913b231e189824b679b60d9c9d45549bb047866431cd023afbb0b9d10e579279 cmake-3.14.0-win32-x86.msi
|
||||
9eb42917f9c5dc30ff86d8197497e4f8e2f4455b4c07841aa3dfb3283902d1ee cmake-3.14.0-win32-x86.zip
|
||||
4cbc62929f313d9890d377fa022753e9e5509e7afa3e16978127b7b2813633cf cmake-3.14.0-win64-x64.msi
|
||||
42c47c0b378834d1250c8076c39175d21ccf9801f67d7e8662b5edc0b2f4f7a6 cmake-3.14.0-win64-x64.zip
|
||||
685523c50288165ce23c6b580ba9c9ba344e194e3b7cce2ce319700fab28906b cmake-3.14.0.tar.Z
|
||||
aa76ba67b3c2af1946701f847073f4652af5cbd9f141f221c97af99127e75502 cmake-3.14.0.tar.gz
|
||||
dc7d51d172baedcdd5349f514a5c3de504dea67ec3c3b5651f712089a1747bb9 cmake-3.14.0.zip
|
16
cmake-3.14.0-SHA-256.txt.asc
Normal file
16
cmake-3.14.0-SHA-256.txt.asc
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAlyKZJAACgkQLSzvEDSS
|
||||
FoTOxg/+PPFQtnrZyki1pObK8YWZIr2aRnOcYEyAaQAvQbd9fTGdmaQA1giSpkXM
|
||||
I+rn+f+iSO1PkaF+DsZrHDJiZx9hHrrHpTj+mIiFmJQb8tfcHGbZO0QaptvCRubp
|
||||
yI6xg+pmxPUeEQMQqV5iseX4xpZ5fqrgO48IHCAzON9VaBl9wMq7OPCJfaG3elQD
|
||||
plbgbEMKriwPn0TmaW+I4n08oqyXhD8Hcx8xfNF6IpKwhtq1UU56cK6R5ByDO25s
|
||||
o3SLp59IyP8KkgizTeKNbuA9TsU19VOc2sJFZYGJX7p/eRngSvtTU2uu3bDUUnO5
|
||||
BthkWM/0ULVuBQC6gu4y+vOIcJbn9Ea9I7Cp4XkPBEiHvlu6Qdrs26d1X8m3CpCc
|
||||
8ZM1pJG9INluiJUwxkidqO2hiKEAxnuOhfeXeZDIzw9enzmcQWFcD+M/9Bm9rWkp
|
||||
Rkm6TyUduHFdORtIHcB3klUilUztzhuuSK0HHB3ThYVnMgkJaTl8YO2RLfOtWt+3
|
||||
LMTZSoBoOKhYQGbvvHKd4KGSUmNxbKFFM7UyCNleqmCnUSqGmTKYe88NZQaIr1B8
|
||||
YVZBpYey1kbrOU+jlwJFoeGbHJF4y9AZV96RyRZSjAE6UGd4wj7QiQVkCq0MgW82
|
||||
dpFy6nDgKRbhdlWhlkbaXPkqwoeenPS+hGH60BOOABD++pQApR4=
|
||||
=OWLk
|
||||
-----END PGP SIGNATURE-----
|
3
cmake-3.14.0.tar.gz
Normal file
3
cmake-3.14.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:aa76ba67b3c2af1946701f847073f4652af5cbd9f141f221c97af99127e75502
|
||||
size 8846626
|
32
cmake-fix-1096008.patch
Normal file
32
cmake-fix-1096008.patch
Normal file
@ -0,0 +1,32 @@
|
||||
--- a/Tests/RunCMake/PositionIndependentCode/b_CMP0083-cmp0083_new-check.cmake
|
||||
+++ b/Tests/RunCMake/PositionIndependentCode/CMP0083-cmp0083_new-check.cmake
|
||||
@@ -7,10 +7,10 @@
|
||||
|
||||
if (ref STREQUAL "PIE")
|
||||
# check no_pie executable is really no position independent
|
||||
- check_executable ("${cmp0083_new_no_pie}" new_no_pie)
|
||||
- if (NOT new_no_pie STREQUAL "NO_PIE")
|
||||
- set (RunCMake_TEST_FAILED "CMP0083(NEW) do not produce expected executable.")
|
||||
- endif()
|
||||
+ #check_executable ("${cmp0083_new_no_pie}" new_no_pie)
|
||||
+ #if (NOT new_no_pie STREQUAL "NO_PIE")
|
||||
+ # set (RunCMake_TEST_FAILED "CMP0083(NEW) do not produce expected executable.")
|
||||
+ #endif()
|
||||
elseif (ref STREQUAL "NO_PIE")
|
||||
# check pie executable is really position independent
|
||||
check_executable ("${cmp0083_new_pie}" new_pie)
|
||||
|
||||
--- a/Tests/RunCMake/PositionIndependentCode/PIE-pie_off-check.cmake
|
||||
+++ b/Tests/RunCMake/PositionIndependentCode/b_PIE-pie_off-check.cmake
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
include ("${RunCMake_TEST_BINARY_DIR}/${RunCMake_TEST_CONFIG}/PIE_config.cmake")
|
||||
|
||||
-check_executable ("${pie_off}" status)
|
||||
-if (NOT status STREQUAL "NO_PIE")
|
||||
- set (RunCMake_TEST_FAILED "Executable is NOT 'no PIE' (${status}).")
|
||||
-endif()
|
||||
+#check_executable ("${pie_off}" status)
|
||||
+#if (NOT status STREQUAL "NO_PIE")
|
||||
+# set (RunCMake_TEST_FAILED "Executable is NOT 'no PIE' (${status}).")
|
||||
+#endif()
|
@ -2,7 +2,7 @@ Index: b/Modules/FindRuby.cmake
|
||||
===================================================================
|
||||
--- a/Modules/FindRuby.cmake
|
||||
+++ b/Modules/FindRuby.cmake
|
||||
@@ -110,7 +110,7 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO
|
||||
@@ -111,7 +111,7 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO
|
||||
_RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
|
||||
|
||||
# vendor_ruby available ?
|
||||
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 15 05:19:38 UTC 2019 - Christoph G <foss@grueninger.de>
|
||||
|
||||
- update to 3.14.0
|
||||
* The "cmake-gui(1)" dialog gained new "-S" and "-B" arguments to
|
||||
explicitly specify source and build directories.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 08 14:03:11 UTC 2019 - seanlew@opensuse.org
|
||||
|
||||
|
@ -16,7 +16,7 @@
|
||||
#
|
||||
|
||||
|
||||
%define shortversion 3.13
|
||||
%define shortversion 3.14
|
||||
# exclude for SLE 12 and Leap 42.x
|
||||
%if 0%{?suse_version} == 1315
|
||||
%define system_libuv OFF
|
||||
@ -25,7 +25,7 @@
|
||||
BuildRequires: libuv-devel >= 1.10
|
||||
%endif
|
||||
Name: cmake-gui
|
||||
Version: 3.13.4
|
||||
Version: 3.14.0
|
||||
Release: 0
|
||||
Summary: CMake graphical user interface
|
||||
License: BSD-3-Clause
|
||||
|
@ -1,3 +1,35 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 15 05:20:57 UTC 2019 - Christoph G <foss@grueninger.de>
|
||||
|
||||
- update to 3.14.0
|
||||
* The “install(TARGETS)” command learned how to install to an
|
||||
appropriate default directory for a given target type, based
|
||||
on variables from the “GNUInstallDirs” module and built-in
|
||||
defaults, in lieu of a “DESTINATION” argument.
|
||||
* The “install(FILES)” and “install(DIRECTORY)” commands learned
|
||||
a new set of parameters for installing files as a file type,
|
||||
setting the destination based on the appropriate variables
|
||||
from “GNUInstallDirs” and built-in defaults, in lieu of a
|
||||
“DESTINATION” argument.
|
||||
* The “install(CODE)” and “install(SCRIPT)” commands learned to
|
||||
support generator expressions. See policy “CMP0087”.
|
||||
* The “if()” command gained support for checking if cache
|
||||
variables are defined with the “DEFINED CACHE{VAR}” syntax.
|
||||
* A file-based api for clients to get semantic buildsystem
|
||||
information has been added. See the “cmake-file-api(7)”
|
||||
manual. This is intended to replace the “cmake-server(7)”
|
||||
mode for IDEs.
|
||||
* The “cmake(1)” Build Tool Mode (“cmake –build”) gained “–
|
||||
verbose” and “-v” options to specify verbose build output.
|
||||
* The “cmake(1)” “-E compare_files” command learned a new
|
||||
“–ignore-eol” option to specify that end-of-line
|
||||
differences should be ignored when comparing files.
|
||||
* ChangeLog: https://cmake.org/cmake/help/v3.14/release/3.14.html
|
||||
- added patch cmake-fix-1096008.patch to remove failing test due
|
||||
to boo#1096008
|
||||
- adjusted changed line numbers in cmake-fix-ruby-test.patch
|
||||
and feature-suse-python-interp-search-order.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 14 00:52:40 UTC 2019 - Simon Lees <sflees@suse.de>
|
||||
|
||||
|
14
cmake.spec
14
cmake.spec
@ -16,7 +16,7 @@
|
||||
#
|
||||
|
||||
|
||||
%define shortversion 3.13
|
||||
%define shortversion 3.14
|
||||
# exclude for SLE 12 and Leap 42.x
|
||||
%if 0%{?suse_version} == 1315
|
||||
%define system_libuv OFF
|
||||
@ -25,7 +25,7 @@
|
||||
BuildRequires: libuv-devel >= 1.10
|
||||
%endif
|
||||
Name: cmake
|
||||
Version: 3.13.4
|
||||
Version: 3.14.0
|
||||
Release: 0
|
||||
Summary: Cross-platform, open-source make system
|
||||
License: BSD-3-Clause
|
||||
@ -39,6 +39,8 @@ Source4: cmake.prov
|
||||
Source5: https://www.cmake.org/files/v%{shortversion}/%{name}-%{version}-SHA-256.txt
|
||||
Source6: https://www.cmake.org/files/v%{shortversion}/%{name}-%{version}-SHA-256.txt.asc
|
||||
Source7: cmake.keyring
|
||||
# Patch to work around boo#1096008
|
||||
Patch1: cmake-fix-1096008.patch
|
||||
Patch2: cmake-fix-ruby-test.patch
|
||||
# PATCH-FIX-UPSTREAM form.patch -- set the correct include path for the ncurses includes
|
||||
Patch4: form.patch
|
||||
@ -53,7 +55,7 @@ BuildRequires: libbz2-devel
|
||||
BuildRequires: libexpat-devel
|
||||
BuildRequires: ncurses-devel
|
||||
# this is commented as it would create dependancy cycle between jsoncpp and cmake
|
||||
#if 0%{?suse_version} > 1320
|
||||
#if 0 % { ? suse_version} > 1320
|
||||
#BuildRequires: pkgconfig(jsoncpp)
|
||||
#endif
|
||||
BuildRequires: pkgconfig
|
||||
@ -121,12 +123,6 @@ done
|
||||
install -D -p -m 0644 Auxiliary/cmake-mode.el %{buildroot}%{cmake_mode_el}
|
||||
rm %{buildroot}%{_datadir}/%{name}/editors/emacs/cmake-mode.el
|
||||
|
||||
# SLE12 or OpenSUSE Leap 42
|
||||
%if 0%{?suse_version} == 1315
|
||||
# remove left over orig file
|
||||
rm %{buildroot}%{_datadir}/%{name}/Modules/FindPythonInterp.cmake.orig
|
||||
%endif
|
||||
|
||||
%fdupes %{buildroot}%{_datadir}/cmake
|
||||
|
||||
%check
|
||||
|
@ -2,7 +2,7 @@ Index: cmake-3.10.1/Modules/FindPythonInterp.cmake
|
||||
===================================================================
|
||||
--- cmake-3.10.1.orig/Modules/FindPythonInterp.cmake
|
||||
+++ cmake-3.10.1/Modules/FindPythonInterp.cmake
|
||||
@@ -78,8 +78,9 @@ if(DEFINED PYTHONLIBS_VERSION_STRING)
|
||||
@@ -83,8 +83,9 @@ if(DEFINED PYTHONLIBS_VERSION_STRING)
|
||||
list(GET _PYTHONLIBS_VERSION 1 _PYTHONLIBS_VERSION_MINOR)
|
||||
list(APPEND _Python_VERSIONS ${_PYTHONLIBS_VERSION_MAJOR}.${_PYTHONLIBS_VERSION_MINOR})
|
||||
endif()
|
||||
|
Loading…
Reference in New Issue
Block a user