[med-svn] [gdcm] 01/02: d/rules: Set default java version to 1.5 on hurd-i386

[Gert Wollny]

This is an automated email from the git hooks/post-receive script.

gert-guest pushed a commit to branch master
in repository gdcm.

commit 673e34b58867471a90e2fd70b30d442ecd16f505
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Tue Aug 23 16:57:49 2016 +0000

    d/rules: Set default java version to 1.5 on hurd-i386
---
 debian/rules | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/rules b/debian/rules
index ade6931..4d8bff7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,11 @@ DEB_WRAP_CSHARP = 0
 endif
 export LD_LIBRARY_PATH
 
+DEFAULT_JAVA_VERSION=1.7
+ifeq ($(DEB_BUILD_ARCH),hurd-i386)
+  DEFAULT_JAVA_VERSION=1.5
+endif 
+
 # deduce documentation option (build-indep target)
 ifeq "" "$(filter %-doc,$(shell dh_listpackages))"
   BUILDDOC = OFF
@@ -55,6 +60,7 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \
 		-DGDCM_WRAP_PYTHON:BOOL=ON \
 		-DGDCM_WRAP_CSHARP:BOOL=$(DEB_WRAP_CSHARP) \
 		-DGDCM_WRAP_JAVA:BOOL=ON \
+		-DGDCM_DEFAULT_JAVA_VERSION:STRING=$(DEFAULT_JAVA_VERSION) \
 		-DGDCM_WRAP_PHP:BOOL=OFF \
 		-DGDCM_USE_PVRG:BOOL=ON \
 		-DGDCM_USE_SYSTEM_PVRG:BOOL=ON \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/gdcm.git