[Pkg-ocaml-maint-commits] [SCM] ocaml-batteries packaging branch, master, updated. debian/0.20081112+gitBB342A7-1-1-g8da8829

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 8da8829edb5a6b0b6e6edeefd321d26a287f93fd
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Wed Nov 12 13:58:52 2008 +0100

    debian/rules: pass -byte-plugin to ocamlbuild when ocamlopt is not available (fixes FTBFS on non-native archs)

diff --git a/debian/changelog b/debian/changelog
index 77623eb..8bed13e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml-batteries (0.20081112+gitBB342A7-2) UNRELEASED; urgency=low
+
+  * debian/rules: pass -byte-plugin to ocamlbuild when ocamlopt is not
+    available (fixes FTBFS on non-native archs)
+
+ -- Stefano Zacchiroli <zack at debian.org>  Wed, 12 Nov 2008 13:49:58 +0100
+
 ocaml-batteries (0.20081112+gitBB342A7-1) experimental; urgency=low
 
   * new snapshot, now following upstream Git
diff --git a/debian/rules b/debian/rules
index ae4a7de..cb1edda 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,13 +9,16 @@ DEV_PKG_NAME = lib$(LIB_NAME)-ocaml-dev
 DOC_PKG_NAME = lib$(LIB_NAME)-ocaml-doc
 DEST_DIR = $(CURDIR)/debian/$(DEV_PKG_NAME)$(OCAML_STDLIB_DIR)
 
+OCAMLBUILD_FLAGS = -classic-display
 DEB_CONFIGURE_EXTRA_FLAGS = --with-browser="x-www-browser %s"
 DEB_CONFIGURE_EXTRA_FLAGS += --with-docroot="/usr/share/doc/$(DOC_PKG_NAME)"
 DEB_MAKE_BUILD_TARGET = all
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 DEB_MAKE_BUILD_TARGET += opt
+else
+OCAMLBUILD_FLAGS += -byte-plugin
 endif
-DEB_MAKE_BUILD_TARGET += OBFLAGS=-classic-display
+DEB_MAKE_BUILD_TARGET += OBFLAGS="$(OCAMLBUILD_FLAGS)"
 DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DEST_DIR)
 DEB_MAKE_CLEAN_TARGET = clean
 

-- 
ocaml-batteries packaging