rebase jni patch
This commit is contained in:
parent
3d57928da9
commit
8e17d2851a
@ -1,18 +0,0 @@
|
||||
--- cmake-2.4.3/Modules/FindJNI.cmake.orig 2006-10-31 16:07:57.000000000 -0700
|
||||
+++ cmake-2.4.3/Modules/FindJNI.cmake 2006-10-31 16:09:36.000000000 -0700
|
||||
@@ -14,6 +14,7 @@
|
||||
$ENV{JAVA_HOME}/jre/lib/i386
|
||||
$ENV{JAVA_HOME}/jre/lib/amd64
|
||||
/usr/lib
|
||||
+ /usr/lib/jvm/java/lib
|
||||
/usr/local/lib
|
||||
/usr/lib/java/jre/lib/i386
|
||||
/usr/local/lib/java/jre/lib/i386
|
||||
@@ -27,6 +28,7 @@
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
|
||||
$ENV{JAVA_HOME}/include
|
||||
/usr/include
|
||||
+ /usr/lib/jvm/java/include
|
||||
/usr/local/include
|
||||
/usr/lib/java/include
|
||||
/usr/local/lib/java/include
|
19
cmake-2.6.1-jni.patch
Normal file
19
cmake-2.6.1-jni.patch
Normal file
@ -0,0 +1,19 @@
|
||||
diff -up cmake-2.6.1/Modules/FindJNI.cmake.jni cmake-2.6.1/Modules/FindJNI.cmake
|
||||
--- cmake-2.6.1/Modules/FindJNI.cmake.jni 2008-08-01 10:34:50.000000000 -0500
|
||||
+++ cmake-2.6.1/Modules/FindJNI.cmake 2008-08-26 15:15:01.000000000 -0500
|
||||
@@ -23,6 +23,7 @@ SET(JAVA_AWT_LIBRARY_DIRECTORIES
|
||||
$ENV{JAVA_HOME}/jre/lib/amd64
|
||||
$ENV{JAVA_HOME}/jre/lib/ppc
|
||||
/usr/lib
|
||||
+ /usr/lib/jvm/java/lib
|
||||
/usr/local/lib
|
||||
/usr/lib/jvm/java/lib
|
||||
/usr/lib/java/jre/lib/i386
|
||||
@@ -61,6 +62,7 @@ SET(JAVA_AWT_INCLUDE_DIRECTORIES
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
|
||||
$ENV{JAVA_HOME}/include
|
||||
/usr/include
|
||||
+ /usr/lib/jvm/java/include
|
||||
/usr/local/include
|
||||
/usr/lib/java/include
|
||||
/usr/local/lib/java/include
|
@ -14,7 +14,7 @@ Source0: http://www.cmake.org/files/v2.6/cmake-%{version}.tar.gz
|
||||
Source2: macros.cmake
|
||||
#Patch to look for jni files where Fedora puts them.
|
||||
#Submitted upstream: http://public.kitware.com/Bug/view.php?id=7333
|
||||
Patch0: cmake-2.6.0-jni.patch
|
||||
Patch0: cmake-2.6.1-jni.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
# fix a crasher, see
|
||||
|
Loading…
Reference in New Issue
Block a user