[Pkg-ocaml-maint-commits] r2094 - in trunk/packages/facile/trunk/debian: . patches

[Julien Cristau]

Author: jcristau-guest
Date: 2005-11-22 18:18:54 +0000 (Tue, 22 Nov 2005)
New Revision: 2094

Modified:
   trunk/packages/facile/trunk/debian/changelog
   trunk/packages/facile/trunk/debian/patches/10-srcMakefile.dpatch
Log:
Adapt patch to upstream Makefile to not try to build the native library
when ocamlopt isn't available (Closes: #340305).


Modified: trunk/packages/facile/trunk/debian/changelog
===================================================================
--- trunk/packages/facile/trunk/debian/changelog	2005-11-21 21:40:44 UTC (rev 2093)
+++ trunk/packages/facile/trunk/debian/changelog	2005-11-22 18:18:54 UTC (rev 2094)
@@ -1,3 +1,10 @@
+facile (1.1-2) unstable; urgency=low
+
+  * Adapt patch to upstream Makefile to not try to build the native library
+    when ocamlopt isn't available (Closes: #340305).
+
+ -- Julien Cristau <julien.cristau at ens-lyon.org>  Tue, 22 Nov 2005 19:18:05 +0100
+
 facile (1.1-1) unstable; urgency=low
 
   * Initial release (Closes: #336852)

Modified: trunk/packages/facile/trunk/debian/patches/10-srcMakefile.dpatch
===================================================================
--- trunk/packages/facile/trunk/debian/patches/10-srcMakefile.dpatch	2005-11-21 21:40:44 UTC (rev 2093)
+++ trunk/packages/facile/trunk/debian/patches/10-srcMakefile.dpatch	2005-11-22 18:18:54 UTC (rev 2094)
@@ -25,16 +25,22 @@
 @DPATCH@
 --- Makefile.orig	2005-11-04 16:52:50.000000000 +0100
 +++ facile-1.1/src/Makefile	2005-11-04 16:54:54.000000000 +0100
-@@ -23,7 +23,7 @@
- 	$(OCAMLC) -o $@ -a $(CSTRCMO)
+@@ -15,8 +15,13 @@
+ CSTRCMO = $(CSTR:.ml=.cmo)
+ CSTRCMX = $(CSTR:.ml=.cmx)
  
- facile.cmxa : $(CSTRCMX)
--	$(OCAMLOPT) -o $@ -a $(CSTRCMX)
-+	if [ -x /usr/bin/ocamlopt ] ; then $(OCAMLOPT) -o $@ -a $(CSTRCMX) ; fi
++CMXA =
++ifneq ($(wildcard /usr/bin/ocamlopt),)
++CMXA = facile.cmxa
++endif
++
+ # Default target: libraries and toplevel
+-all : facile.cma facile.cmxa facile
++all : facile.cma $(CMXA) facile
  
- # Version of the library to be linked with the -p (profiler) option
- facile.p.cmxa : $(CSTR)
-@@ -31,7 +31,7 @@
+ # Libraries
+ facile.cma : $(CSTRCMO)
+@@ -31,7 +36,7 @@
  	make facile.cmxa OPTOPT=-p
  	rm -fr $(CSTRCMX)
  	mv facile.cmxa $@
@@ -43,7 +49,7 @@
  
  # Toplevel (to be run with the "-I +facile" option)
  facile : facile.cma
-@@ -45,7 +45,7 @@
+@@ -45,7 +50,7 @@
  	make facile.cmxa OPTOPT="-pp inline_functors"
  	rm -fr $(CSTRCMX)
  	mv facile.cmxa $@