[Pkg-ocaml-maint-commits] r3416 - in /trunk/packages/advi/trunk/debian: changelog rules

[jcristau-guest at users.alioth.debian.org]

Author: jcristau-guest
Date: Thu Dec 21 00:25:03 2006
New Revision: 3416

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3416
Log:
* Build with ocamlc instead of ocamlopt on arm to fix build failure.

Modified:
    trunk/packages/advi/trunk/debian/changelog
    trunk/packages/advi/trunk/debian/rules

Modified: trunk/packages/advi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/advi/trunk/debian/changelog?rev=3416&op=diff
==============================================================================
--- trunk/packages/advi/trunk/debian/changelog (original)
+++ trunk/packages/advi/trunk/debian/changelog Thu Dec 21 00:25:03 2006
@@ -1,8 +1,9 @@
-advi (1.6.0-12) UNRELEASED; urgency=low
+advi (1.6.0-12) unstable; urgency=low
 
   * Remove inactive people from the Uploaders field.
-
- -- Julien Cristau <julien.cristau at ens-lyon.org>  Sun, 17 Dec 2006 14:31:33 +0100
+  * Build with ocamlc instead of ocamlopt on arm to fix build failure.
+
+ -- Julien Cristau <julien.cristau at ens-lyon.org>  Thu, 21 Dec 2006 00:23:24 +0100
 
 advi (1.6.0-11) unstable; urgency=high
 

Modified: trunk/packages/advi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/advi/trunk/debian/rules?rev=3416&op=diff
==============================================================================
--- trunk/packages/advi/trunk/debian/rules (original)
+++ trunk/packages/advi/trunk/debian/rules Thu Dec 21 00:25:03 2006
@@ -13,6 +13,7 @@
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 BACKUP_SOURCE = doc/manual.dvi \
 		doc/manual.ps          \
@@ -31,6 +32,11 @@
 
 OPTOPT = $(shell test -x /usr/bin/ocamlopt.opt && echo true)
 OPT = $(shell test -x /usr/bin/ocamlopt && echo true)
+# the native compiler is b0rked on arm, don't try to use it
+ifeq ($(DEB_BUILD_ARCH),arm)
+	OPT = false
+	OPTOPT = false
+endif
 
 CFLAGS = -Wall -g