From 92161e1afbf126142dfc0a0b69763d965a38b84099f7892467bb034e37910c37 Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Fri, 22 Feb 2019 06:29:35 +0000 Subject: [PATCH 1/2] Accepting request 677935 from home:Andreas_Schwab:Factory - Drop c17-default.patch, has been solved differently upstream OBS-URL: https://build.opensuse.org/request/show/677935 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=352 --- c17-default.patch | 76 ----------------------------------------------- cmake.changes | 5 ++++ cmake.spec | 1 - 3 files changed, 5 insertions(+), 77 deletions(-) delete mode 100644 c17-default.patch diff --git a/c17-default.patch b/c17-default.patch deleted file mode 100644 index ca3b5ce..0000000 --- a/c17-default.patch +++ /dev/null @@ -1,76 +0,0 @@ -Index: b/Modules/CMakeCCompilerId.c.in -=================================================================== ---- a/Modules/CMakeCCompilerId.c.in -+++ b/Modules/CMakeCCompilerId.c.in -@@ -40,6 +40,8 @@ char const *info_cray = "INFO" ":" "comp - # else - # define C_DIALECT - # endif -+#elif __STDC_VERSION__ >= 201710L -+# define C_DIALECT "17" - #elif __STDC_VERSION__ >= 201000L - # define C_DIALECT "11" - #elif __STDC_VERSION__ >= 199901L -Index: b/Modules/Compiler/GNU-C.cmake -=================================================================== ---- a/Modules/Compiler/GNU-C.cmake -+++ b/Modules/Compiler/GNU-C.cmake -@@ -22,4 +22,4 @@ elseif (NOT CMAKE_C_COMPILER_VERSION VER - set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu1x") - endif() - --__compiler_check_default_language_standard(C 3.4 90 5.0 11) -+__compiler_check_default_language_standard(C 3.4 90 5.0 11 8.0 17) -Index: b/Source/cmLocalGenerator.cxx -=================================================================== ---- a/Source/cmLocalGenerator.cxx -+++ b/Source/cmLocalGenerator.cxx -@@ -1566,6 +1566,7 @@ void cmLocalGenerator::AddCompilerRequir - langStdMap["CXX"].push_back("11"); - langStdMap["CXX"].push_back("98"); - -+ langStdMap["C"].push_back("17"); - langStdMap["C"].push_back("11"); - langStdMap["C"].push_back("99"); - langStdMap["C"].push_back("90"); -Index: b/Source/cmMakefile.cxx -=================================================================== ---- a/Source/cmMakefile.cxx -+++ b/Source/cmMakefile.cxx -@@ -4261,7 +4261,7 @@ static const char* const CXX_FEATURES[] = { nullptr FOR_EACH_CXX_FEATURE( - FEATURE_STRING) }; - #undef FEATURE_STRING - --static const char* const C_STANDARDS[] = { "90", "99", "11" }; -+static const char* const C_STANDARDS[] = { "90", "99", "11", "17" }; - static const char* const CXX_STANDARDS[] = { "98", "11", "14", "17", "20" }; - - bool cmMakefile::AddRequiredTargetFeature(cmTarget* target, -Index: b/Tests/CompileFeatures/CMakeLists.txt -=================================================================== ---- a/Tests/CompileFeatures/CMakeLists.txt -+++ b/Tests/CompileFeatures/CMakeLists.txt -@@ -214,6 +214,7 @@ if (C_expected_features) - if (std_flag_idx EQUAL -1) - add_executable(default_dialect_C default_dialect.c) - target_compile_definitions(default_dialect_C PRIVATE -+ DEFAULT_C17=$ - DEFAULT_C11=$ - DEFAULT_C99=$ - DEFAULT_C90=$ -Index: b/Tests/CompileFeatures/default_dialect.c -=================================================================== ---- a/Tests/CompileFeatures/default_dialect.c -+++ b/Tests/CompileFeatures/default_dialect.c -@@ -1,5 +1,9 @@ - --#if DEFAULT_C11 -+#if DEFAULT_C17 -+#if __STDC_VERSION__ < 201710L -+# error Unexpected value for __STDC_VERSION__. -+#endif -+#elif DEFAULT_C11 - # if __STDC_VERSION__ < 201112L - # error Unexpected value for __STDC_VERSION__. - # endif - diff --git a/cmake.changes b/cmake.changes index ddbdbb0..cce50c1 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 20 15:52:37 UTC 2019 - schwab@suse.de + +- Drop c17-default.patch, has been solved differently upstream + ------------------------------------------------------------------- Mon Feb 18 08:42:05 UTC 2019 - schwab@suse.de diff --git a/cmake.spec b/cmake.spec index 23858ef..21fd753 100644 --- a/cmake.spec +++ b/cmake.spec @@ -46,7 +46,6 @@ Patch4: form.patch Patch5: system-libs.patch # Search for python interpreters from newest to oldest rather then picking up /usr/bin/python as first choice Patch7: feature-suse-python-interp-search-order.patch -Patch8: c17-default.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libarchive-devel >= 3.0.2 From 906336994699647fba3445399ad06677ba0f143214a55a2cb63d8718c0ae5a8c Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Mon, 25 Feb 2019 23:32:48 +0000 Subject: [PATCH 2/2] Accepting request 678963 from home:dancermak:branches:devel:tools:building Add cmake-mode.el without BuildRequires: emacs This should not create a build loop as the first sr. Also, cmake now builds on Leap 42 and SLE 12 OBS-URL: https://build.opensuse.org/request/show/678963 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=353 --- cmake.changes | 6 ++++++ cmake.spec | 13 +++++++++++++ 2 files changed, 19 insertions(+) diff --git a/cmake.changes b/cmake.changes index cce50c1..27f1be9 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 25 13:53:26 UTC 2019 - Dan Čermák + +- Install cmake-mode.el + * remove a left over .orig file on Leap <= 42.3 and SLE 12 <= SP3 + ------------------------------------------------------------------- Wed Feb 20 15:52:37 UTC 2019 - schwab@suse.de diff --git a/cmake.spec b/cmake.spec index 21fd753..21a532d 100644 --- a/cmake.spec +++ b/cmake.spec @@ -116,6 +116,17 @@ do ln -s ../../%{name}/completions/$(basename $f) %{buildroot}%{_datadir}/bash-completion/completions done +# cmake-mode.el +%define cmake_mode_el %{_datadir}/emacs/site-lisp/%{name}-mode.el +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 @@ -142,5 +153,7 @@ done %{_datadir}/aclocal/cmake.m4 %doc %{_docdir}/%{name} %{_datadir}/bash-completion +%{cmake_mode_el} +%dir %{dirname:%{cmake_mode_el}} %changelog