[Pkg-ocaml-maint-commits] r5705 - in /trunk/packages/felix/trunk/debian: changelog rules

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

Author: glondu-guest
Date: Tue May 27 23:14:38 2008
New Revision: 5705

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5705
Log:
Use the same compiler suite as OCaml to avoid FTBFS when OCaml
was not compiled with 'gcc'.

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

Modified: trunk/packages/felix/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/felix/trunk/debian/changelog?rev=5705&op=diff
==============================================================================
--- trunk/packages/felix/trunk/debian/changelog (original)
+++ trunk/packages/felix/trunk/debian/changelog Tue May 27 23:14:38 2008
@@ -5,8 +5,10 @@
 
   [ Stephane Glondu ]
   * Acknowledge NMU.
+  * Use the same compiler suite as OCaml to avoid FTBFS when OCaml
+    was not compiled with 'gcc'.
 
- -- Stephane Glondu <steph at glondu.net>  Tue, 27 May 2008 10:52:45 +0200
+ -- Stephane Glondu <steph at glondu.net>  Wed, 28 May 2008 01:03:12 +0200
 
 felix (1.1.3-3.1) unstable; urgency=low
 

Modified: trunk/packages/felix/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/felix/trunk/debian/rules?rev=5705&op=diff
==============================================================================
--- trunk/packages/felix/trunk/debian/rules (original)
+++ trunk/packages/felix/trunk/debian/rules Tue May 27 23:14:38 2008
@@ -20,6 +20,8 @@
 OCAMLABI = $(shell ocamlc -version)
 BYTECODE = $(shell [ -x /usr/bin/ocamlopt ] || echo yes)
 OCAMLRUN = $(if $(BYTECODE),ocaml-base-nox-$(OCAMLABI))
+OCAMLGCC = $(shell sed -n 's/NATIVECC=//p' /usr/lib/ocaml/$(OCAMLABI)/Makefile.config)
+OCAMLGXX = $(subst cc,++,$(OCAMLGCC))
 
 .PHONY: get-orig-source
 
@@ -30,6 +32,11 @@
 
 config-stamp: patch-stamp
 	dh_testdir
+# Use the same C compiler as OCaml to prevent FTBFS when it is not gcc
+	sed -i.orig \
+	  -e "s/DEFAULT_COM = 'gcc'/DEFAULT_COM = '$(OCAMLGCC)'/" \
+	  -e "s/DEFAULT_COM = 'g++'/DEFAULT_COM = '$(OCAMLGXX)'/" \
+	  lpsrc/flx_config_builders.ipk
 # prefix is necessary	to bind the install root into the 'flx' driver script
 # this has no effect on installation, because Debian doesn't use any of
 # Felix's native installation script
@@ -54,6 +61,9 @@
 clean1:
 	dh_testdir
 	dh_testroot
+	if [ -f lpsrc/flx_config_builders.ipk.orig ]; then \
+	  mv lpsrc/flx_config_builders.ipk.orig lpsrc/flx_config_builders.ipk; \
+	fi
 	rm -f build-stamp config-stamp
 	-$(MAKE) distclean
 	rm -f a.out flxlib.cmxa flxlib.a hostlib/libelk_host_static.a
@@ -103,5 +113,3 @@
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install 
-
-