From 04706b61f097f816f50e0ca66b66be20f0543311 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Mon, 21 Sep 2015 20:03:14 +0200 Subject: [PATCH] - rel 3; min-ver fix still needed --- cmake-min-ver.patch | 40 ++++++++++++++++++++++++++++++++++++++++ cmake.spec | 5 +++-- 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 cmake-min-ver.patch diff --git a/cmake-min-ver.patch b/cmake-min-ver.patch new file mode 100644 index 0000000..f356a09 --- /dev/null +++ b/cmake-min-ver.patch @@ -0,0 +1,40 @@ +From b9ec9392da21a3421e48c6961976060d872faffb Mon Sep 17 00:00:00 2001 +From: Rolf Eike Beer +Date: Tue, 18 Aug 2015 12:14:43 +0200 +Subject: [PATCH 1/1] FindPkgConfig: remove variable dereference + +If CMAKE_MINIMUM_REQUIRED_VERSION is not set because no +cmake_minimum_required() call is present this line can lead to an error as that +string is empty so too few arguments are passed to if(): + +See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeOutput.log". +See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeError.log". +CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:112 (elseif): + given arguments: + + "VERSION_LESS" "3.1" + + Unknown arguments specified +Call Stack (most recent call first): + /usr/share/cmake/Modules/FindPkgConfig.cmake:501 (_pkgconfig_parse_options) + /usr/share/cmake/Modules/FindOpenSSL.cmake:43 (pkg_check_modules) +--- + Modules/FindPkgConfig.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake +index 526a62e..ae6903e 100644 +--- a/Modules/FindPkgConfig.cmake ++++ b/Modules/FindPkgConfig.cmake +@@ -109,7 +109,7 @@ macro(_pkgconfig_parse_options _result _is_req _is_silent _no_cmake_path _no_cma + set(${_no_cmake_path} 1) + set(${_no_cmake_environment_path} 1) + endif() +- elseif(${CMAKE_MINIMUM_REQUIRED_VERSION} VERSION_LESS 3.1) ++ elseif(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 3.1) + set(${_no_cmake_path} 1) + set(${_no_cmake_environment_path} 1) + endif() +-- +1.7.10.4 + diff --git a/cmake.spec b/cmake.spec index 966d2b2..195ae0f 100644 --- a/cmake.spec +++ b/cmake.spec @@ -15,7 +15,7 @@ Summary: Cross-platform, open-source make system Summary(pl.UTF-8): Wieloplatformowy system make o otwartych źródłach Name: cmake Version: 3.3.2 -Release: 2 +Release: 3 License: BSD Group: Development/Building Source0: http://www.cmake.org/files/v3.3/%{name}-%{version}.tar.gz @@ -23,7 +23,7 @@ Source0: http://www.cmake.org/files/v3.3/%{name}-%{version}.tar.gz Patch0: %{name}-lib64.patch Patch1: %{name}-helpers.patch Patch2: %{name}-findruby.patch - +Patch3: cmake-min-ver.patch Patch5: %{name}-findruby2.patch Patch6: %{name}-findpython.patch Patch7: %{name}-libx32.patch @@ -117,6 +117,7 @@ Bashowe dopełnianie parametrów dla cmake'a. %endif %patch1 -p1 %patch2 -p1 +%patch3 -p1 %patch5 -p1 %patch6 -p1 -- 2.43.0