Accepting request 611479 from devel:tools:building

OBS-URL: https://build.opensuse.org/request/show/611479
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cmake?expand=0&rev=147
This commit is contained in:
Dominique Leuenberger 2018-05-25 19:34:33 +00:00 committed by Git OBS Bridge
commit a30e9e4a8f
4 changed files with 26 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun May 20 22:53:46 UTC 2018 - foss@grueninger.de
- Use libuv provided by CMake for Leap 42.3.
-------------------------------------------------------------------
Thu May 17 20:26:45 UTC 2018 - foss@grueninger.de

View File

@ -37,7 +37,13 @@ BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: libarchive-devel >= 3.0.2
BuildRequires: libexpat-devel
BuildRequires: libuv-devel
# exclude for SLE 12 and Leap 42.x
%if 0%{?suse_version} == 1315
%define system_libuv OFF
%else
BuildRequires: libuv-devel >= 1.10
%define system_libuv ON
%endif
BuildRequires: openssl-devel
# this is commented as it would create dependancy cycle between jsoncpp and cmake
#if 0%{?suse_version} > 1320
@ -89,7 +95,7 @@ export CXXFLAGS="%{optflags}"
--verbose \
--qt-gui \
-- \
-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=ON
-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=%{system_libuv}
make VERBOSE=1 %{?_smp_mflags}
%install

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun May 20 22:54:17 UTC 2018 - foss@grueninger.de
- Use libuv provided by CMake for Leap 42.3 and SLE 12.
-------------------------------------------------------------------
Thu May 17 20:26:30 UTC 2018 - foss@grueninger.de

View File

@ -50,7 +50,13 @@ BuildRequires: libcurl-mini-devel
BuildRequires: libcurl-devel
%endif
BuildRequires: libexpat-devel
BuildRequires: libuv-devel
# exclude for SLE 12 and Leap 42.x
%if 0%{?suse_version} == 1315
%define system_libuv OFF
%else
BuildRequires: libuv-devel >= 1.10
%define system_libuv ON
%endif
BuildRequires: ncurses-devel
# this is commented as it would create dependancy cycle between jsoncpp and cmake
#if 0%{?suse_version} > 1320
@ -90,7 +96,7 @@ export CXXFLAGS="%{optflags}"
--verbose \
--no-qt-gui \
-- \
-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=ON
-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=%{system_libuv}
make VERBOSE=1 %{?_smp_mflags}
%install