testing/cmake
SHA256
3
0
Fork 0
forked from pool/cmake
Code Pull Requests Activity

Accepting request 561776 from home:simotek:branches:devel:tools

Browse Source 
- Add feature-suse-python-interp-search-order.patch to make sure 
  that python3 is found before python2
- switch to using %autopatch

OBS-URL: https://build.opensuse.org/request/show/561776
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=310
This commit is contained in:
Simon Lees 2018-01-05 00:49:45 +00:00 committed by Git OBS Bridge
parent 5032e1818c
commit 79eab23e07
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jan 4 11:42:59 UTC 2018 - sflees@suse.de
- Add feature-suse-python-interp-search-order.patch to make sure
that python3 is found before python2
- switch to using %autopatch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 4 11:09:29 UTC 2018 - tchvatal@suse.com Thu Jan 4 11:09:29 UTC 2018 - tchvatal@suse.com

7
cmake.spec
View File

@ -38,6 +38,8 @@ Patch4: form.patch
# PATCH-FIX-UPSTREAM system-libs.patch -- allow choosing between bundled and system jsoncpp & form libs # PATCH-FIX-UPSTREAM system-libs.patch -- allow choosing between bundled and system jsoncpp & form libs
Patch5: system-libs.patch Patch5: system-libs.patch
Patch6: cmake-3.10.1_boost-1.66.patch Patch6: cmake-3.10.1_boost-1.66.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
%if 0%{?suse_version} >= 1330 %if 0%{?suse_version} >= 1330
BuildRequires: libcurl-mini-devel BuildRequires: libcurl-mini-devel
%else %else
@ -79,10 +81,7 @@ CMake is a cross-platform, open-source build system
# Verify hashes in that file against source tarball. # Verify hashes in that file against source tarball.
echo "`grep %{name}-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'` %{SOURCE0}" | sha256sum -c echo "`grep %{name}-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'` %{SOURCE0}" | sha256sum -c
%setup -q %setup -q
%patch2 -p1 %autopatch -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build %build
export CFLAGS="%{optflags}" export CFLAGS="%{optflags}"

16
feature-suse-python-interp-search-order.patch Normal file
View File

@ -0,0 +1,16 @@
Index: cmake-3.10.1/Modules/FindPythonInterp.cmake
===================================================================
--- cmake-3.10.1.orig/Modules/FindPythonInterp.cmake
+++ cmake-3.10.1/Modules/FindPythonInterp.cmake
@@ -78,8 +78,9 @@ if(DEFINED PYTHONLIBS_VERSION_STRING)
list(GET _PYTHONLIBS_VERSION 1 _PYTHONLIBS_VERSION_MINOR)
list(APPEND _Python_VERSIONS ${_PYTHONLIBS_VERSION_MAJOR}.${_PYTHONLIBS_VERSION_MINOR})
endif()
-# Search for the current active python version first
-list(APPEND _Python_VERSIONS ";")
+
+# Search python versions from newest to oldest as python3 is the default and
+# /usr/bin/python doesn't mean the systemd on SUSE / openSUSE systems
list(APPEND _Python_VERSIONS ${_PYTHON_FIND_OTHER_VERSIONS})
unset(_PYTHON_FIND_OTHER_VERSIONS)