Package: vtk
Version: 5.2.1-7
Severity: serious
Tags: patch
Justification: no longer builds from source
vtk fails to determine the path of libjawt.so when the debian
architecture is different from the debian CPU. This is the case for
example on the following architectures:
arch | cpu
----------------+-------
armel | arm
kfreebsd-amd64 | amd64
kfreebsd-i386 | i386
The path to libjawt.so then corresponds to:
/usr/lib/jvm/default-java/jre/lib/$(CPU)/libjawt.so
The patch below fixes the problem.
diff -u vtk-5.2.1/debian/rules vtk-5.2.1/debian/rules
--- vtk-5.2.1/debian/rules
+++ vtk-5.2.1/debian/rules
@@ -7,7 +7,6 @@
PWD=$(shell pwd)
DVER=$(shell cat /etc/debian_version)
-DARCH=$(shell dpkg --print-installation-architecture)
GPPVER=$(shell dpkg --status g++ | grep Version | cut -d ' ' -f 2)
export GCC=gcc
export GPP=g++
@@ -15,11 +14,14 @@
#export CXX=g++-4.3
export SHELL=/bin/bash
+DEB_HOST_ARCH ?=$(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_CPU ?=$(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+
# The next line will cause Dart to be used if it is installed...
DARTP=$(shell if [ -d /usr/share/Dart ]; then echo USE_DART; else echo
DONT_USE_DART; fi )
# Hack for parisc64 to close bug #133696
-ifeq ($(DARCH),parisc64)
+ifeq ($(DEB_HOST_ARCH),parisc64)
export CXXFLAGS=-g -ffunction-sections -Wall
else
export CXXFLAGS=-g -Wall
@@ -28,15 +30,13 @@
export TCLLIBPATH=$(CURDIR)/Build/Wrapping/Tcl/
export CFLAGS=-g -Wall
-DEB_BUILD_ARCH ?=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
CXXFLAGS += -O0
else
#optimisation seems to cause a segfault on
#arm old abi so disable it
- ifeq ($(DEB_BUILD_ARCH),arm)
+ ifeq ($(DEB_HOST_ARCH),arm)
CFLAGS += -O0
CXXFLAGS += -O0
else
@@ -67,7 +67,7 @@
mkdir -p Build
cp debian/CMakeCache.txt.debian Build/CMakeCache.txt
# echo CMAKE_X_CFLAGS:STRING=-I/usr/X11R6/include >>
Build/CMakeCache.txt
- echo BUILDNAME:STRING=Debian-vtk_5.2.1-6_$(DARCH).deb >>
Build/CMakeCache.txt
+ echo BUILDNAME:STRING=Debian-vtk_5.2.1-6_$(DEB_HOST_ARCH).deb >>
Build/CMakeCache.txt
echo VTK_JAVA_JAR:FILEPATH=/usr/share/java/vtk-5.2.1.jar >>
Build/CMakeCache.txt
echo VTK_WRAP_HINTS:FILEPATH=$(CURDIR)/Wrapping/hints >>
Build/CMakeCache.txt
echo VTK_WRAP_PYTHON_EXE:FILEPATH=$(CURDIR)/Build/bin/vtkWrapPython >>
Build/CMakeCache.txt
@@ -88,7 +88,7 @@
echo VTK_INSTALL_LIB_DIR:PATH=/lib/vtk-5.2 >> Build/CMakeCache.txt
echo VTK_INSTALL_PACKAGE_DIR:PATH=/lib/vtk-5.2 >> Build/CMakeCache.txt
(if [[ $(DARTP) == "USE_DART" ]]; then echo
DART_ROOT:PATH=/usr/share/Dart >> Build/CMakeCache.txt; fi)
- echo
JAVA_AWT_LIBRARY:FILEPATH=/usr/lib/jvm/default-java/jre/lib/$(DARCH)/libjawt.so
>> Build/CMakeCache.txt
+ echo
JAVA_AWT_LIBRARY:FILEPATH=/usr/lib/jvm/default-java/jre/lib/$(DEB_HOST_ARCH_CPU)/libjawt.so
>> Build/CMakeCache.txt
echo VTK_PYTHON_SETUP_ARGS:STRING=--install-layout=deb
--root=$(CURDIR)/debian/tmp/ >> Build/CMakeCache.txt
( cd Build ; cmake .. )
-- System Information:
Debian Release: 5.0.2
APT prefers stable
APT policy: (500, 'stable')
Architecture: armel (armv5tejl)
Kernel: Linux 2.6.26-2-versatile
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
