[Pkg-ocaml-maint-commits] [SCM] camljava packaging branch, master, updated. upstream/0.3.orig-5-g41faf0a

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 70721f1b19c2a08604ecab8f3da885de9d9150eb
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Thu Nov 26 14:31:50 2009 +0100

    add detection of Java architecture tag

diff --git a/debian/rules b/debian/rules
index 8832ed1..619ad51 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,10 +8,18 @@ PKGNAME = libcamljava-ocaml-dev
 DESTDIR := $(CURDIR)/debian/$(PKGNAME)/$(OCAML_STDLIB_DIR)/camljava
 OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES)
 
+DEFJAVA_DIR = /usr/lib/jvm/default-java
+
+# /usr/lib/jvm/default-java/jre/lib/amd64/server/libjvm.so -> amd64
+# XXX horrible way to retrieve Java arch, but unfortunately there is no
+# reliable mapping available yet (see #558109)
+JAVA_ARCH := $(shell find $(DEFJAVA_DIR)/ -path '*jre/lib/*/server/libjvm.so' | cut -f 8 -d /)
+
+BUILD_TARGET_FLAGS = ARCH=$(JAVA_ARCH)
 DEB_MAKE_INSTALL_TARGET = install CAMLJAVALIB=$(DESTDIR)
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-DEB_MAKE_BUILD_TARGET = all
+DEB_MAKE_BUILD_TARGET = all $(BUILD_TARGET_FLAGS)
 else
-DEB_MAKE_BUILD_TARGET = byte
+DEB_MAKE_BUILD_TARGET = byte $(BUILD_TARGET_FLAGS)
 endif
 

-- 
camljava packaging