Author: malat-guest Date: 2009-07-16 12:39:32 +0000 (Thu, 16 Jul 2009) New Revision: 3646
Added: trunk/packages/gdcm/trunk/debian/patches/vtk_java_cp.patch Modified: trunk/packages/gdcm/trunk/debian/changelog trunk/packages/gdcm/trunk/debian/patches/series Log: update Modified: trunk/packages/gdcm/trunk/debian/changelog =================================================================== --- trunk/packages/gdcm/trunk/debian/changelog 2009-07-16 05:59:05 UTC (rev 3645) +++ trunk/packages/gdcm/trunk/debian/changelog 2009-07-16 12:39:32 UTC (rev 3646) @@ -1,3 +1,9 @@ +gdcm (2.0.12-9) unstable; urgency=low + + * Fix FTBS on hppa, with gcj 4.4. javac does not support -cp cmd line option + + -- Mathieu Malaterre <[email protected]> Thu, 16 Jul 2009 14:38:58 +0200 + gdcm (2.0.12-8) unstable; urgency=low * Fix issue with LD_LIBRARY_PATH and dh_shlibdeps on private libs Modified: trunk/packages/gdcm/trunk/debian/patches/series =================================================================== --- trunk/packages/gdcm/trunk/debian/patches/series 2009-07-16 05:59:05 UTC (rev 3645) +++ trunk/packages/gdcm/trunk/debian/patches/series 2009-07-16 12:39:32 UTC (rev 3646) @@ -3,3 +3,4 @@ share_man.patch java_covariant_return_type.patch gcc44.patch +vtk_java_cp.patch Added: trunk/packages/gdcm/trunk/debian/patches/vtk_java_cp.patch =================================================================== --- trunk/packages/gdcm/trunk/debian/patches/vtk_java_cp.patch (rev 0) +++ trunk/packages/gdcm/trunk/debian/patches/vtk_java_cp.patch 2009-07-16 12:39:32 UTC (rev 3646) @@ -0,0 +1,27 @@ +javac does not support -cp, only java does. +http://gdcm.svn.sf.net/viewvc/gdcm/trunk/Utilities/VTK/CMakeLists.txt?view=patch&r1=5894&r2=5893&pathrev=5894 + +--- trunk/Utilities/VTK/CMakeLists.txt 2009/07/16 10:46:25 5893 ++++ trunk/Utilities/VTK/CMakeLists.txt 2009/07/16 12:23:18 5894 +@@ -255,7 +255,7 @@ + MARK_AS_ADVANCED(GDCM_VTK_JAVA_JAR) + if(EXISTS ${GDCM_VTK_JAVA_JAR}) + else(EXISTS ${GDCM_VTK_JAVA_JAR}) +- message(FATAL_ERROR "Could not find vtk.jar file") ++ message(FATAL_ERROR "Could not find vtk.jar file, VTK_JAVA_JAR is wrong, please set proper GDCM_VTK_JAVA_JAR replacement var") + endif(EXISTS ${GDCM_VTK_JAVA_JAR}) + ADD_LIBRARY(${VTKGDCM_NAME}Java SHARED ${vtkgdcmJAVA_SRCS}) + TARGET_LINK_LIBRARIES(${VTKGDCM_NAME}Java ${VTKGDCM_NAME}) +@@ -267,7 +267,10 @@ + # to recompile from an existing build tree with invalid generated *.java file... + ADD_CUSTOM_COMMAND( + OUTPUT ${LIBRARY_OUTPUT_PATH}/vtkgdcm.jar +- COMMAND ${JAVA_COMPILE} ARGS -cp ${GDCM_VTK_JAVA_JAR} "vtk/*.java" ++ #COMMAND ${JAVA_COMPILE} ARGS -cp ${GDCM_VTK_JAVA_JAR} "vtk/*.java" ++ # No such thing as -cp for javac only java is listed: ++ # http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/classpath.html ++ COMMAND ${JAVA_COMPILE} ARGS -classpath ${GDCM_VTK_JAVA_JAR} "vtk/*.java" + COMMAND ${JAVA_ARCHIVE} ARGS cvf ${LIBRARY_OUTPUT_PATH}/${PROJECT_NAME}.jar vtk/*.class + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/java + DEPENDS ${VTKGDCM_NAME}Java + Property changes on: trunk/packages/gdcm/trunk/debian/patches/vtk_java_cp.patch ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
