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

- Prefix swig python modules with _ to avoid clashes bnc#874885:

Browse Source 
* cmake-prefix-swig.patch

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=185
This commit is contained in:
Tomáš Chvátal 2015-01-12 09:34:31 +00:00 committed by Git OBS Bridge
parent a87fd7baf9
commit adeb273de6
4 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake-gui.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package cmake-gui
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed

13
cmake-prefix-swig.patch Normal file
View File

@ -0,0 +1,13 @@
Index: cmake-3.1.0/Modules/UseSWIG.cmake
===================================================================
--- cmake-3.1.0.orig/Modules/UseSWIG.cmake
+++ cmake-3.1.0/Modules/UseSWIG.cmake
@@ -260,7 +260,7 @@ macro(SWIG_ADD_MODULE name language)
set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES PREFIX "")
elseif ("${swig_lowercase_language}" STREQUAL "python")
# this is only needed for the python case where a _modulename.so is generated
- set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES PREFIX "")
+ set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES PREFIX "_")
# Python extension modules on Windows must have the extension ".pyd"
# instead of ".dll" as of Python 2.5. Older python versions do support
# this suffix.

6
cmake.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jan 12 09:29:48 UTC 2015 - tchvatal@suse.com
- Prefix swig python modules with _ to avoid clashes bnc#874885:
* cmake-prefix-swig.patch
-------------------------------------------------------------------
Wed Dec 17 21:09:23 UTC 2014 - hrvoje.senjan@gmail.com

5
cmake.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package cmake
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -28,6 +28,8 @@ Source0: http://www.cmake.org/files/v3.1/%{name}-%{rversion}.tar.gz
Source1: cmake.macros
Source2: opensuse_rules.cmake
Patch2: cmake-fix-ruby-test.patch
# PATCH-FIX-OPENSUSE: bnc#874885 contain the python swig namespace
Patch3: cmake-prefix-swig.patch
BuildRequires: curl-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
@ -49,6 +51,7 @@ CMake is a cross-platform, open-source build system
%prep
%setup -q -n %{name}-%{rversion}
%patch2 -p1
%patch3 -p1
%build
export CXXFLAGS="%{optflags}"