[SCM] libbluray/master: Restrict JAVA related checks to Linux architectures (Fixes FTBFS on !Linux)
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Fri Sep 30 10:41:45 UTC 2011
The following commit has been merged in the master branch:
commit 85846329790b90f938a8be37ce47e687a769ecc3
Author: Reinhard Tartler <siretart at tauware.de>
Date: Fri Sep 30 08:58:22 2011 +0200
Restrict JAVA related checks to Linux architectures (Fixes FTBFS on !Linux)
Thanks: Christoph Egger for reporting on IRC
diff --git a/debian/rules b/debian/rules
index 9429fa3..6b36c7d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,21 +3,21 @@
DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+confflags := --enable-doxygen-doc
+
+# enable bdjava on linux hosts only
+ifneq (,$(findstring linux,$(DEB_BUILD_ARCH_OS)))
+
# openjdk-6_6b23~pre8-2 and later have multiarchified JAVA_HOME
JAVA_HOME=/usr/lib/jvm/java-6-openjdk-$(DEB_BUILD_ARCH)
ifeq (,$(wildcard $(JAVA_HOME)))
JAVA_HOME=/usr/lib/jvm/java-6-openjdk
ifeq (,$(wildcard $(JAVA_HOME)))
- $(info "warning: No suitable jni.h was found. Package will most probably FTBFS!"))
+ $(info "warning: No suitable jni.h was found. Package will most probably FTBFS!")
endif
endif
$(info Located java at $(JAVA_HOME))
-
-confflags := --enable-doxygen-doc
-
-# enable bdjava on linux hosts only
-ifneq (,$(findstring linux,$(DEB_BUILD_ARCH_OS)))
confflags += --enable-bdjava --with-jdk=$(JAVA_HOME)
endif
--
libbluray packaging
More information about the pkg-multimedia-commits
mailing list