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

Accepting request 222660 from devel:tools:building

Browse Source 
- Add ppc64le to FindJNI 
- added patches:
  * cmake-jni-ppc64le.patch (forwarded request 222652 from k0da)

OBS-URL: https://build.opensuse.org/request/show/222660
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cmake?expand=0&rev=80
This commit is contained in:
Stephan Kulow 2014-02-19 17:55:03 +00:00 committed by Git OBS Bridge
commit a546a22805
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmake-jni-ppc64le.patch Normal file
View File

@ -0,0 +1,13 @@
Index: cmake-2.8.12.1/Modules/FindJNI.cmake
===================================================================
--- cmake-2.8.12.1.orig/Modules/FindJNI.cmake
+++ cmake-2.8.12.1/Modules/FindJNI.cmake
@@ -45,6 +45,8 @@ macro(java_append_library_directories _v
# mips* machines are bi-endian mostly so processor does not tell
# endianess of the underlying system.
set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb")
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64le")
+ set(_java_libarch "ppc64le")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
set(_java_libarch "ppc64")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")

7
cmake.changes
View File

@ -1,4 +1,11 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 18 00:30:04 UTC 2014 - dvaleev@suse.com
- Add ppc64le to FindJNI
- added patches:
* cmake-jni-ppc64le.patch
-------------------------------------------------------------------
Tue Jan 28 19:46:59 UTC 2014 - hrvoje.senjan@gmail.com Tue Jan 28 19:46:59 UTC 2014 - hrvoje.senjan@gmail.com
- Update to 2.8.12.2 - Update to 2.8.12.2

3
cmake.spec
View File

@ -26,6 +26,8 @@ Source2: opensuse_rules.cmake
Patch2: cmake-fix-ruby-test.patch Patch2: cmake-fix-ruby-test.patch
# PATCH-FIX-UPSTREAM fix-check-for-freetype251.patch -- http://www.cmake.org/Bug/view.php?id=13959, http://www.cmake.org/Bug/view.php?id=14601 # PATCH-FIX-UPSTREAM fix-check-for-freetype251.patch -- http://www.cmake.org/Bug/view.php?id=13959, http://www.cmake.org/Bug/view.php?id=14601
Patch3: fix-check-for-freetype251.patch Patch3: fix-check-for-freetype251.patch
# PATCH-FIX-UPSTREAM cmake-jni-ppc64le.patch -- https://github.com/Kitware/CMake/pull/90
Patch4: cmake-jni-ppc64le.patch
Summary: Cross-platform, open-source make system Summary: Cross-platform, open-source make system
License: BSD-3-Clause License: BSD-3-Clause
Group: Development/Tools/Building Group: Development/Tools/Building
@ -56,6 +58,7 @@ CMake is a cross-platform, open-source make system
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch2 %patch2
%patch3 -p1 %patch3 -p1
%patch4 -p1
%build %build
export CXXFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS"