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

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cmake?expand=0&rev=24

Browse Source
This commit is contained in:
OBS User unknown 2008-10-13 21:15:08 +00:00 committed by Git OBS Bridge
parent 209b8b89b2
commit 52bb317b12
3 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Oct 13 22:22:01 CEST 2008 - dmueller@suse.de
- Fix Detection of IBM Java (needed for PPC build of Java modules)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 30 15:05:12 CEST 2008 - puzel@suse.cz Tue Sep 30 15:05:12 CEST 2008 - puzel@suse.cz

6
cmake.spec
View File

@ -20,7 +20,7 @@
Name: cmake Name: cmake
Version: 2.6.2 Version: 2.6.2
Release: 1 Release: 2
License: BSD 3-Clause License: BSD 3-Clause
Group: Development/Tools/Building Group: Development/Tools/Building
%define tar_version %version %define tar_version %version
@ -29,6 +29,7 @@ Source0: %{name}-%{tar_version}.tar.bz2
Patch0: cmake-2.6.0-use_intree_xmlrpc.patch Patch0: cmake-2.6.0-use_intree_xmlrpc.patch
Patch2: cmake-2.6.0-use_shared_python_lib.patch Patch2: cmake-2.6.0-use_shared_python_lib.patch
Patch4: cmake-disable-builtin-chrpath.diff Patch4: cmake-disable-builtin-chrpath.diff
Patch5: ibm-java-paths.diff
Summary: Cross-platform, open-source make system Summary: Cross-platform, open-source make system
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} > 1020 %if 0%{?suse_version} > 1020
@ -72,6 +73,7 @@ Authors:
#%patch1 #%patch1
%patch2 %patch2
%patch4 %patch4
%patch5
%build %build
EXTRA_FLAGS="" EXTRA_FLAGS=""
@ -128,6 +130,8 @@ rm -rf %{buildroot}
%endif %endif
%changelog %changelog
* Tue Oct 14 2008 dmueller@suse.de
- Fix Detection of IBM Java (needed for PPC build of Java modules)
* Tue Sep 30 2008 puzel@suse.cz * Tue Sep 30 2008 puzel@suse.cz
- update to 2.6.2: - update to 2.6.2:
- Fixed: cpack did not work when sym-linked after install - Fixed: cpack did not work when sym-linked after install

26
ibm-java-paths.diff Normal file
View File

@ -0,0 +1,26 @@
--- Modules/FindJNI.cmake
+++ Modules/FindJNI.cmake
@@ -22,6 +22,8 @@ SET(JAVA_AWT_LIBRARY_DIRECTORIES
$ENV{JAVA_HOME}/jre/lib/i386
$ENV{JAVA_HOME}/jre/lib/amd64
$ENV{JAVA_HOME}/jre/lib/ppc
+ $ENV{JAVA_HOME}/jre/lib/ppc/classic
+ $ENV{JAVA_HOME}/jre/lib/ppc64/classic
/usr/lib
/usr/local/lib
/usr/lib/jvm/java/lib
@@ -166,7 +168,12 @@ SET(JNI_LIBRARIES
SET(JNI_INCLUDE_DIRS
${JAVA_INCLUDE_PATH}
- ${JAVA_INCLUDE_PATH2}
- ${JAVA_AWT_INCLUDE_PATH}
)
+if(JAVA_INCLUDE_PATH2)
+ SET(JNI_INCLUDE_DIRS ${JNI_INCLUDE_DIRS} ${JAVA_INCLUDE_PATH2})
+endif(JAVA_INCLUDE_PATH2)
+
+if(JAVA_AWT_INCLUDE_PATH)
+ SET(JNI_INCLUDE_DIRS ${JNI_INCLUDE_DIRS} ${JAVA_AWT_INCLUDE_PATH})
+endif(JAVA_AWT_INCLUDE_PATH)