[Pkg-ocaml-maint-commits] r6008 - in /trunk/packages/facile/trunk/debian: changelog patches/00list patches/30-non-opt-check.dpatch patches/40-allow-ocamlc-override-in-examples.dpatch

Thu Oct 9 13:41:21 UTC 2008

Author: lool
Date: Thu Oct  9 13:41:20 2008
New Revision: 6008

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=6008
Log:
* Fix ocamlopt usage; closes: #501672.
  - New dpatch, 30-non-opt-check, ocamlopt isn't available on all arches;
    don't use it for make check.
  - New patch, 40-allow-ocamlc-override-in-examples, allow overriding OCAMLC
    in examples by using separate _INVOKE vars to run misc commands.

Added:
    trunk/packages/facile/trunk/debian/patches/30-non-opt-check.dpatch   (with props)
    trunk/packages/facile/trunk/debian/patches/40-allow-ocamlc-override-in-examples.dpatch   (with props)
Modified:
    trunk/packages/facile/trunk/debian/changelog
    trunk/packages/facile/trunk/debian/patches/00list

Modified: trunk/packages/facile/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/facile/trunk/debian/changelog?rev=6008&op=diff
==============================================================================

--- trunk/packages/facile/trunk/debian/changelog (original)
+++ trunk/packages/facile/trunk/debian/changelog Thu Oct  9 13:41:20 2008
@@ -1,7 +1,12 @@
-facile (1.1-6.3) UNRELEASED; urgency=low
+facile (1.1-6.3) unstable; urgency=low
 
   * Call clean in examples/ manually as upstream's Makefile wont and cdbs
     doesn't keep the patches applied when cleaning.
+  * Fix ocamlopt usage; closes: #501672.
+    - New dpatch, 30-non-opt-check, ocamlopt isn't available on all arches;
+      don't use it for make check.
+    - New patch, 40-allow-ocamlc-override-in-examples, allow overriding OCAMLC
+      in examples by using separate _INVOKE vars to run misc commands.
 
  -- Loic Minier <lool at dooz.org>  Thu, 09 Oct 2008 15:20:00 +0200
 

Modified: trunk/packages/facile/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/facile/trunk/debian/patches/00list?rev=6008&op=diff
==============================================================================
--- trunk/packages/facile/trunk/debian/patches/00list (original)
+++ trunk/packages/facile/trunk/debian/patches/00list Thu Oct  9 13:41:20 2008
@@ -1,2 +1,4 @@
 10-srcMakefile
 20-Makefile
+30-non-opt-check
+40-allow-ocamlc-override-in-examples

Added: trunk/packages/facile/trunk/debian/patches/30-non-opt-check.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/facile/trunk/debian/patches/30-non-opt-check.dpatch?rev=6008&op=file
==============================================================================
--- trunk/packages/facile/trunk/debian/patches/30-non-opt-check.dpatch (added)
+++ trunk/packages/facile/trunk/debian/patches/30-non-opt-check.dpatch Thu Oct  9 13:41:20 2008
@@ -1,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30-non-opt-check.dpatch by Loic Minier <lool at dooz.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: ocamlopt isn't available on all arches; don't use it for make check
+
+ at DPATCH@
+diff -urNad facile-1.1~/Makefile facile-1.1/Makefile
+--- facile-1.1~/Makefile	2008-10-09 15:26:49.000000000 +0200
++++ facile-1.1/Makefile	2008-10-09 15:26:57.000000000 +0200
+@@ -24,4 +24,4 @@
+ 	rm -fr $(FACILEDIR)
+ 
+ check:
+-	cd examples; make FACILEDIR=../src queens.opt; ./queens.opt 8
++	cd examples; $(MAKE) FACILEDIR=../src queens.out && ./queens.out 8

Propchange: trunk/packages/facile/trunk/debian/patches/30-non-opt-check.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: trunk/packages/facile/trunk/debian/patches/40-allow-ocamlc-override-in-examples.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/facile/trunk/debian/patches/40-allow-ocamlc-override-in-examples.dpatch?rev=6008&op=file
==============================================================================
--- trunk/packages/facile/trunk/debian/patches/40-allow-ocamlc-override-in-examples.dpatch (added)
+++ trunk/packages/facile/trunk/debian/patches/40-allow-ocamlc-override-in-examples.dpatch Thu Oct  9 13:41:20 2008
@@ -1,0 +1,65 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40-allow-ocamlc-override-in-examples.dpatch by Loic Minier <lool at dooz.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: allow overriding OCAMLC in examples by using separate _INVOKE vars to
+## DP: run misc commands.
+
+ at DPATCH@
+diff -urNad facile-1.1~/examples/Makefile facile-1.1/examples/Makefile
+--- facile-1.1~/examples/Makefile	2004-09-08 11:51:02.000000000 +0200
++++ facile-1.1/examples/Makefile	2008-10-09 15:36:32.000000000 +0200
+@@ -7,32 +7,34 @@
+ FACILEDIR= +facile
+ INCLUDES= -I $(FACILEDIR)
+ 
+-OCAMLC= ocamlc -g $(INCLUDES)
+-OCAMLMLI= ocamlc $(INCLUDES)
+-OCAMLOPT= ocamlopt $(INCLUDES)
+-OCAMLDEP= ocamldep $(INCLUDES)
++OCAMLC= ocamlc -g
++OCAMLMLI= ocamlc
++OCAMLOPT= ocamlopt
++OCAMLDEP= ocamldep
++OCAMLC_INVOKE = $(OCAMLC) $(INCLUDES)
++OCAMLOPT_INVOKE = $(OCAMLOPT) $(INCLUDES)
+ 
+ .SUFFIXES:
+ .SUFFIXES: .ml .mli .mly .mll .cmi .cmo .cmx .out .opt .p.cmx .popt
+ 
+ .ml.cmo :
+-	$(OCAMLC) -c $<
++	$(OCAMLC_INVOKE) -c $<
+ .mli.cmi :
+-	$(OCAMLMLI) -c $<
++	$(OCAMLMLI) $(INCLUDES) -c $<
+ .ml.cmx :
+-	$(OCAMLOPT) -c $<
++	$(OCAMLOPT_INVOKE) -c $<
+ # To produce profiled objects
+ .ml.p.cmx :
+-	$(OCAMLOPT) -p -c $<
++	$(OCAMLOPT_INVOKE) -p -c $<
+ 	mv $*.cmx $@
+ 	mv $*.o $*.p.o
+ .cmo.out :
+-	$(OCAMLC) -o $@ facile.cma $<
++	$(OCAMLC_INVOKE) -o $@ facile.cma $<
+ # To produce profiled binaries
+ .p.cmx.popt :
+-	$(OCAMLOPT) -p -o $@ facile.p.cmxa $<
++	$(OCAMLOPT_INVOKE) -p -o $@ facile.p.cmxa $<
+ .cmx.opt :
+-	$(OCAMLOPT) -o $@ facile.cmxa $<
++	$(OCAMLOPT_INVOKE) -o $@ facile.cmxa $<
+ .mly.ml :
+ 	ocamlyacc $<
+ .mll.ml :
+@@ -42,6 +44,6 @@
+ 	\rm -f *.cmo *.cmi *.cmx *.o *~ *.opt *.out .depend *.popt
+ 
+ .depend:
+-	$(OCAMLDEP) *.mli *.ml > $@
++	$(OCAMLDEP) $(INCLUDES) *.mli *.ml > $@
+ 
+ include .depend

Propchange: trunk/packages/facile/trunk/debian/patches/40-allow-ocamlc-override-in-examples.dpatch
------------------------------------------------------------------------------
    svn:executable = *


