[med-svn] r4773 - in trunk/packages/gdcm/trunk/debian: . patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Mon May 3 17:02:17 UTC 2010
Author: malat-guest
Date: 2010-05-03 17:02:15 +0000 (Mon, 03 May 2010)
New Revision: 4773
Added:
trunk/packages/gdcm/trunk/debian/patches/findjni.cmake.patch
Modified:
trunk/packages/gdcm/trunk/debian/changelog
trunk/packages/gdcm/trunk/debian/patches/series
Log:
Working to solve issue #579959 (really is in cmake: #544674)
Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog 2010-05-03 16:04:27 UTC (rev 4772)
+++ trunk/packages/gdcm/trunk/debian/changelog 2010-05-03 17:02:15 UTC (rev 4773)
@@ -1,3 +1,9 @@
+gdcm (2.0.14-6) unstable; urgency=low
+
+ * FTBFS on mipsel and armel, unable to find java. Closes: #579959
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Mon, 03 May 2010 19:12:03 +0200
+
gdcm (2.0.14-5) unstable; urgency=low
* Fix a lintian issue about embedded-libjpeg
Added: trunk/packages/gdcm/trunk/debian/patches/findjni.cmake.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/findjni.cmake.patch (rev 0)
+++ trunk/packages/gdcm/trunk/debian/patches/findjni.cmake.patch 2010-05-03 17:02:15 UTC (rev 4773)
@@ -0,0 +1,190 @@
+Fix for neverending bug #544674 (backport from debian/vtk package)
+
+--- vtk-5.4.2.orig/CMake/FindJNI.cmake
++++ vtk-5.4.2/CMake/FindJNI.cmake
+@@ -0,0 +1,184 @@
++# - Find JNI java libraries.
++# This module finds if Java is installed and determines where the
++# include files and libraries are. It also determines what the name of
++# the library is. This code sets the following variables:
++#
++# JNI_INCLUDE_DIRS = the include dirs to use
++# JNI_LIBRARIES = the libraries to use
++# JAVA_AWT_LIBRARY = the path to the jawt library
++# JAVA_JVM_LIBRARY = the path to the jvm library
++# JAVA_INCLUDE_PATH = the include path to jni.h
++# JAVA_INCLUDE_PATH2 = the include path to jni_md.h
++# JAVA_AWT_INCLUDE_PATH = the include path to jawt.h
++#
++
++GET_FILENAME_COMPONENT(java_install_version
++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
++
++SET(JAVA_AWT_LIBRARY_DIRECTORIES
++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib"
++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib"
++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib"
++ /usr/lib
++ /usr/local/lib
++ /usr/lib/jvm/java/lib
++ /usr/lib/java/jre/lib/i386
++ /usr/local/lib/java/jre/lib/i386
++ /usr/local/share/java/jre/lib/i386
++ /usr/lib/j2sdk1.4-sun/jre/lib/i386
++ /usr/lib/j2sdk1.5-sun/jre/lib/i386
++ /opt/sun-jdk-1.5.0.04/jre/lib/amd64
++ /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/amd64
++ /usr/lib/java/jre/lib/amd64
++ /usr/local/lib/java/jre/lib/amd64
++ /usr/local/share/java/jre/lib/amd64
++ /usr/lib/j2sdk1.4-sun/jre/lib/amd64
++ /usr/lib/j2sdk1.5-sun/jre/lib/amd64
++ /usr/lib/java/jre/lib/ppc
++ /usr/local/lib/java/jre/lib/ppc
++ /usr/local/share/java/jre/lib/ppc
++ /usr/lib/j2sdk1.4-sun/jre/lib/ppc
++ /usr/lib/j2sdk1.5-sun/jre/lib/ppc
++ /usr/lib/jvm/default-java/jre/lib/alpha
++ /usr/lib/jvm/default-java/jre/lib/amd64
++ /usr/lib/jvm/default-java/jre/lib/arm
++ /usr/lib/jvm/default-java/jre/lib/i386
++ /usr/lib/jvm/default-java/jre/lib/ia64
++ /usr/lib/jvm/default-java/jre/lib/m68k
++ /usr/lib/jvm/default-java/jre/lib/mips
++ /usr/lib/jvm/default-java/jre/lib/mipsel
++ /usr/lib/jvm/default-java/jre/lib/parisc
++ /usr/lib/jvm/default-java/jre/lib/powerpc
++ /usr/lib/jvm/default-java/jre/lib/ppc
++ /usr/lib/jvm/default-java/jre/lib/s390
++ /usr/lib/jvm/default-java/jre/lib/sparc
++ /usr/lib/jvm/default-java/jre/lib/x86_64
++ /usr/lib/jvm/default-java/jre/lib/sh
++ )
++
++SET(JAVA_JVM_LIBRARY_DIRECTORIES)
++FOREACH(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
++ SET(JAVA_JVM_LIBRARY_DIRECTORIES
++ ${JAVA_JVM_LIBRARY_DIRECTORIES}
++ "${dir}"
++ "${dir}/client"
++ "${dir}/server"
++ )
++ENDFOREACH(dir)
++
++
++SET(JAVA_AWT_INCLUDE_DIRECTORIES
++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
++ $ENV{JAVA_HOME}/include
++ /usr/include
++ /usr/local/include
++ /usr/lib/java/include
++ /usr/local/lib/java/include
++ /usr/lib/jvm/java/include
++ /usr/lib/jvm/java-6-sun-1.6.0.00/include
++ /usr/local/share/java/include
++ /usr/lib/j2sdk1.4-sun/include
++ /usr/lib/j2sdk1.5-sun/include
++ /opt/sun-jdk-1.5.0.04/include
++ )
++
++FOREACH(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")
++ GET_FILENAME_COMPONENT(jpath "${JAVA_PROG}" PATH)
++ FOREACH(JAVA_INC_PATH ../include ../java/include ../share/java/include)
++ IF(EXISTS ${jpath}/${JAVA_INC_PATH})
++ SET(JAVA_AWT_INCLUDE_DIRECTORIES ${JAVA_AWT_INCLUDE_DIRECTORIES} "${jpath}/${JAVA_INC_PATH}")
++ ENDIF(EXISTS ${jpath}/${JAVA_INC_PATH})
++ ENDFOREACH(JAVA_INC_PATH)
++ FOREACH(JAVA_LIB_PATH
++ ../lib ../jre/lib ../jre/lib/i386
++ ../java/lib ../java/jre/lib ../java/jre/lib/i386
++ ../share/java/lib ../share/java/jre/lib ../share/java/jre/lib/i386)
++ IF(EXISTS ${jpath}/${JAVA_LIB_PATH})
++ SET(JAVA_AWT_LIBRARY_DIRECTORIES ${JAVA_AWT_LIBRARY_DIRECTORIES} "${jpath}/${JAVA_LIB_PATH}")
++ ENDIF(EXISTS ${jpath}/${JAVA_LIB_PATH})
++ ENDFOREACH(JAVA_LIB_PATH)
++ENDFOREACH(JAVA_PROG)
++
++IF(APPLE)
++ IF(EXISTS ~/Library/Frameworks/JavaVM.framework)
++ SET(JAVA_HAVE_FRAMEWORK 1)
++ ENDIF(EXISTS ~/Library/Frameworks/JavaVM.framework)
++ IF(EXISTS /Library/Frameworks/JavaVM.framework)
++ SET(JAVA_HAVE_FRAMEWORK 1)
++ ENDIF(EXISTS /Library/Frameworks/JavaVM.framework)
++ IF(EXISTS /System/Library/Frameworks/JavaVM.framework)
++ SET(JAVA_HAVE_FRAMEWORK 1)
++ ENDIF(EXISTS /System/Library/Frameworks/JavaVM.framework)
++
++ IF(JAVA_HAVE_FRAMEWORK)
++ IF(NOT JAVA_AWT_LIBRARY)
++ SET (JAVA_AWT_LIBRARY "-framework JavaVM" CACHE FILEPATH "Java Frameworks" FORCE)
++ ENDIF(NOT JAVA_AWT_LIBRARY)
++
++ IF(NOT JAVA_JVM_LIBRARY)
++ SET (JAVA_JVM_LIBRARY "-framework JavaVM" CACHE FILEPATH "Java Frameworks" FORCE)
++ ENDIF(NOT JAVA_JVM_LIBRARY)
++
++ IF(NOT JAVA_AWT_INCLUDE_PATH)
++ IF(EXISTS /System/Library/Frameworks/JavaVM.framework/Headers/jawt.h)
++ SET (JAVA_AWT_INCLUDE_PATH "/System/Library/Frameworks/JavaVM.framework/Headers" CACHE FILEPATH "jawt.h location" FORCE)
++ ENDIF(EXISTS /System/Library/Frameworks/JavaVM.framework/Headers/jawt.h)
++ ENDIF(NOT JAVA_AWT_INCLUDE_PATH)
++
++ # If using "-framework JavaVM", prefer its headers *before* the others in
++ # JAVA_AWT_INCLUDE_DIRECTORIES... (*prepend* to the list here)
++ #
++ SET(JAVA_AWT_INCLUDE_DIRECTORIES
++ ~/Library/Frameworks/JavaVM.framework/Headers
++ /Library/Frameworks/JavaVM.framework/Headers
++ /System/Library/Frameworks/JavaVM.framework/Headers
++ ${JAVA_AWT_INCLUDE_DIRECTORIES}
++ )
++ ENDIF(JAVA_HAVE_FRAMEWORK)
++ELSE(APPLE)
++ FIND_LIBRARY(JAVA_AWT_LIBRARY jawt
++ PATHS ${JAVA_AWT_LIBRARY_DIRECTORIES}
++ )
++ FIND_LIBRARY(JAVA_JVM_LIBRARY NAMES jvm JavaVM
++ PATHS ${JAVA_JVM_LIBRARY_DIRECTORIES}
++ )
++ENDIF(APPLE)
++
++# add in the include path
++FIND_PATH(JAVA_INCLUDE_PATH jni.h
++ ${JAVA_AWT_INCLUDE_DIRECTORIES}
++)
++
++FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h
++ ${JAVA_AWT_INCLUDE_DIRECTORIES}
++ ${JAVA_INCLUDE_PATH}/win32
++ ${JAVA_INCLUDE_PATH}/linux
++ ${JAVA_INCLUDE_PATH}/freebsd
++)
++
++FIND_PATH(JAVA_AWT_INCLUDE_PATH jawt.h
++ ${JAVA_AWT_INCLUDE_DIRECTORIES}
++ ${JAVA_INCLUDE_PATH}
++)
++
++MARK_AS_ADVANCED(
++ JAVA_AWT_LIBRARY
++ JAVA_JVM_LIBRARY
++ JAVA_AWT_INCLUDE_PATH
++ JAVA_INCLUDE_PATH
++ JAVA_INCLUDE_PATH2
++)
++
++SET(JNI_LIBRARIES
++ ${JAVA_AWT_LIBRARY}
++ ${JAVA_JVM_LIBRARY}
++)
++
++SET(JNI_INCLUDE_DIRS
++ ${JAVA_INCLUDE_PATH}
++ ${JAVA_INCLUDE_PATH2}
++ ${JAVA_AWT_INCLUDE_PATH}
++)
++
+
Property changes on: trunk/packages/gdcm/trunk/debian/patches/findjni.cmake.patch
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: trunk/packages/gdcm/trunk/debian/patches/series
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/series 2010-05-03 16:04:27 UTC (rev 4772)
+++ trunk/packages/gdcm/trunk/debian/patches/series 2010-05-03 17:02:15 UTC (rev 4773)
@@ -2,3 +2,4 @@
cmake28_namelink.patch
libvtk-java_jni.patch
embedded-libjpeg.patch
+findjni.cmake.patch
More information about the debian-med-commit
mailing list