From 27bfbd96decbc900c607ae3ce28955c405efbf36da804f047e18108564b39e52 Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Mon, 16 Apr 2018 10:53:57 +0000 Subject: [PATCH] Accepting request 596970 from home:frispete:gcc - allow build with curl libs from older distributions - refresh patches - Cleanup spec file with spec-cleaner OBS-URL: https://build.opensuse.org/request/show/596970 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=320 --- c17-default.patch | 42 +++++++++++++++++++-------------------- cmake-fix-ruby-test.patch | 8 +++++--- cmake.changes | 8 +++++++- cmake.spec | 4 ++++ system-libs.patch | 8 +++++--- 5 files changed, 42 insertions(+), 28 deletions(-) diff --git a/c17-default.patch b/c17-default.patch index e3f5e83..36c7607 100644 --- a/c17-default.patch +++ b/c17-default.patch @@ -1,8 +1,8 @@ -Index: cmake-3.10.2/Modules/CMakeCCompilerId.c.in +Index: b/Modules/CMakeCCompilerId.c.in =================================================================== ---- cmake-3.10.2.orig/Modules/CMakeCCompilerId.c.in -+++ cmake-3.10.2/Modules/CMakeCCompilerId.c.in -@@ -39,6 +39,8 @@ char const *info_cray = "INFO" ":" "comp +--- 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 @@ -11,21 +11,21 @@ Index: cmake-3.10.2/Modules/CMakeCCompilerId.c.in #elif __STDC_VERSION__ >= 201000L # define C_DIALECT "11" #elif __STDC_VERSION__ >= 199901L -Index: cmake-3.10.2/Modules/Compiler/GNU-C.cmake +Index: b/Modules/Compiler/GNU-C.cmake =================================================================== ---- cmake-3.10.2.orig/Modules/Compiler/GNU-C.cmake -+++ cmake-3.10.2/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: cmake-3.10.2/Source/cmLocalGenerator.cxx +Index: b/Source/cmLocalGenerator.cxx =================================================================== ---- cmake-3.10.2.orig/Source/cmLocalGenerator.cxx -+++ cmake-3.10.2/Source/cmLocalGenerator.cxx -@@ -1575,6 +1575,7 @@ void cmLocalGenerator::AddCompilerRequir +--- 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"); @@ -33,11 +33,11 @@ Index: cmake-3.10.2/Source/cmLocalGenerator.cxx langStdMap["C"].push_back("11"); langStdMap["C"].push_back("99"); langStdMap["C"].push_back("90"); -Index: cmake-3.10.2/Source/cmMakefile.cxx +Index: b/Source/cmMakefile.cxx =================================================================== ---- cmake-3.10.2.orig/Source/cmMakefile.cxx -+++ cmake-3.10.2/Source/cmMakefile.cxx -@@ -4077,7 +4077,7 @@ static const char* const CXX_FEATURES[] +--- a/Source/cmMakefile.cxx ++++ b/Source/cmMakefile.cxx +@@ -4161,7 +4161,7 @@ static const char* const CXX_FEATURES[] FEATURE_STRING) }; #undef FEATURE_STRING @@ -46,10 +46,10 @@ Index: cmake-3.10.2/Source/cmMakefile.cxx static const char* const CXX_STANDARDS[] = { "98", "11", "14", "17" }; bool cmMakefile::AddRequiredTargetFeature(cmTarget* target, -Index: cmake-3.10.2/Tests/CompileFeatures/CMakeLists.txt +Index: b/Tests/CompileFeatures/CMakeLists.txt =================================================================== ---- cmake-3.10.2.orig/Tests/CompileFeatures/CMakeLists.txt -+++ cmake-3.10.2/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) @@ -58,10 +58,10 @@ Index: cmake-3.10.2/Tests/CompileFeatures/CMakeLists.txt DEFAULT_C11=$ DEFAULT_C99=$ DEFAULT_C90=$ -Index: cmake-3.10.2/Tests/CompileFeatures/default_dialect.c +Index: b/Tests/CompileFeatures/default_dialect.c =================================================================== ---- cmake-3.10.2.orig/Tests/CompileFeatures/default_dialect.c -+++ cmake-3.10.2/Tests/CompileFeatures/default_dialect.c +--- a/Tests/CompileFeatures/default_dialect.c ++++ b/Tests/CompileFeatures/default_dialect.c @@ -1,5 +1,9 @@ -#if DEFAULT_C11 diff --git a/cmake-fix-ruby-test.patch b/cmake-fix-ruby-test.patch index 750c496..a62a5ac 100644 --- a/cmake-fix-ruby-test.patch +++ b/cmake-fix-ruby-test.patch @@ -1,6 +1,8 @@ ---- a/Modules/FindRuby.cmake 2016-11-15 23:00:54.832228081 +0100 -+++ b/Modules/FindRuby.cmake 2016-11-15 23:01:55.201700739 +0100 -@@ -107,7 +107,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 _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR) # vendor_ruby available ? diff --git a/cmake.changes b/cmake.changes index 3d6f458..76eea92 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,7 +1,13 @@ +------------------------------------------------------------------- +Mon Apr 16 10:19:27 UTC 2018 - hpj@urpla.net + +- allow build with curl libs from older distributions +- refresh patches + ------------------------------------------------------------------- Wed Apr 4 10:46:49 UTC 2018 - mpluskal@suse.com -- Clenup spec file with spec-cleaner +- Cleanup spec file with spec-cleaner - Drop conditions for building on Leap ------------------------------------------------------------------- diff --git a/cmake.spec b/cmake.spec index d93d72e..c537cc3 100644 --- a/cmake.spec +++ b/cmake.spec @@ -44,7 +44,11 @@ BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libarchive-devel >= 3.0.2 BuildRequires: libbz2-devel +%if 0%{?suse_version} >= 1330 BuildRequires: libcurl-mini-devel +%else +BuildRequires: libcurl-devel +%endif BuildRequires: libexpat-devel BuildRequires: libuv-devel BuildRequires: ncurses-devel diff --git a/system-libs.patch b/system-libs.patch index 543b299..62f315f 100644 --- a/system-libs.patch +++ b/system-libs.patch @@ -1,6 +1,8 @@ ---- cmake-3.5.0/bootstrap.old -+++ cmake-3.5.0/bootstrap -@@ -724,10 +724,10 @@ +Index: b/bootstrap +=================================================================== +--- a/bootstrap ++++ b/bootstrap +@@ -803,10 +803,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" ;;