From 7403450a0e4231a48290e0c20ab064f412052c7820e1f2803402a28a6331d3c0 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 17 Nov 2016 17:49:04 +0000 Subject: [PATCH] Accepting request 440698 from home:mathletic:branches:devel:tools:building use libuv from CMake tarball if not Leap or Tumbleweed OBS-URL: https://build.opensuse.org/request/show/440698 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=274 --- cmake-gui.changes | 6 ++++++ cmake.changes | 6 ++++++ cmake.spec | 11 ++++++++++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/cmake-gui.changes b/cmake-gui.changes index bde636b..77c4d78 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 16 14:28:58 UTC 2016 - foss@grueninger.de + +- use libuv which is shipped in CMake's tarball for older systems + that do not provide this lib on their own + ------------------------------------------------------------------- Wed Nov 16 00:03:32 UTC 2016 - foss@grueninger.de diff --git a/cmake.changes b/cmake.changes index df3e29c..f86138a 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 16 14:30:02 UTC 2016 - foss@grueninger.de + +- use libuv which is shipped in CMake's tarball for older systems + that do not provide this lib on their own + ------------------------------------------------------------------- Tue Nov 15 23:42:45 UTC 2016 - foss@grueninger.de diff --git a/cmake.spec b/cmake.spec index c501302..63b56f9 100644 --- a/cmake.spec +++ b/cmake.spec @@ -42,7 +42,14 @@ BuildRequires: gcc-c++ BuildRequires: libarchive-devel >= 3.0.2 BuildRequires: libbz2-devel BuildRequires: libexpat-devel +# use libuv package for Leap and Tumbleweed +%if (0%{?suse_version} > 1320 || (0%{?suse_version} == 1320 && 0%{?is_opensuse})) BuildRequires: libuv-devel +%define use_system_uvlib ON +# otherwise use libuv part of CMake tarball +%else +%define use_system_uvlib OFF +%endif BuildRequires: ncurses-devel # this is commented as it would create dependancy cycle between jsoncpp and cmake #if 0%{?suse_version} > 1320 @@ -82,7 +89,9 @@ export CXXFLAGS="%{optflags}" --no-system-jsoncpp \ --parallel=0%{jobs} \ --verbose \ - --no-qt-gui + --no-qt-gui \ + -- \ + -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=%{use_system_uvlib} make VERBOSE=1 %{?_smp_mflags} %install