[Pkg-ocaml-maint-commits] r2661 - in /trunk/packages/coq/branches/8.0pl3+8.1alpha/debian: changelog patches/00list patches/makefile.dpatch

[smimram at users.alioth.debian.org]

Author: smimram
Date: Sun Apr 30 11:55:37 2006
New Revision: 2661

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2661
Log:
Added makefile.dpatch in order for ocamlopt not to be called when compiling on non-native archs.

Added:
    trunk/packages/coq/branches/8.0pl3+8.1alpha/debian/patches/makefile.dpatch   (with props)
Modified:
    trunk/packages/coq/branches/8.0pl3+8.1alpha/debian/changelog
    trunk/packages/coq/branches/8.0pl3+8.1alpha/debian/patches/00list

Modified: trunk/packages/coq/branches/8.0pl3+8.1alpha/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/branches/8.0pl3%2B8.1alpha/debian/changelog?rev=2661&op=diff
==============================================================================
--- trunk/packages/coq/branches/8.0pl3+8.1alpha/debian/changelog (original)
+++ trunk/packages/coq/branches/8.0pl3+8.1alpha/debian/changelog Sun Apr 30 11:55:37 2006
@@ -1,3 +1,10 @@
+coq (8.0pl3+8.1alpha-2) UNRELEASED; urgency=low
+
+  * Added makefile.dpatch in order for ocamlopt not to be called when
+    compiling on non-native archs.
+
+ -- Samuel Mimram <smimram at debian.org>  Sun, 30 Apr 2006 11:51:57 +0000
+
 coq (8.0pl3+8.1alpha-1) experimental; urgency=low
 
   * New upstream release.

Modified: trunk/packages/coq/branches/8.0pl3+8.1alpha/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/branches/8.0pl3%2B8.1alpha/debian/patches/00list?rev=2661&op=diff
==============================================================================
--- trunk/packages/coq/branches/8.0pl3+8.1alpha/debian/patches/00list (original)
+++ trunk/packages/coq/branches/8.0pl3+8.1alpha/debian/patches/00list Sun Apr 30 11:55:37 2006
@@ -1,3 +1,4 @@
 coqdoc_stdlib
 failing_tests
 browser
+makefile

Added: trunk/packages/coq/branches/8.0pl3+8.1alpha/debian/patches/makefile.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/coq/branches/8.0pl3%2B8.1alpha/debian/patches/makefile.dpatch?rev=2661&op=file
==============================================================================
--- trunk/packages/coq/branches/8.0pl3+8.1alpha/debian/patches/makefile.dpatch (added)
+++ trunk/packages/coq/branches/8.0pl3+8.1alpha/debian/patches/makefile.dpatch Sun Apr 30 11:55:37 2006
@@ -1,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## makefile.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Do not use ocamlopt to test grammar.cma, we don't want to use ocamlopt
+## DP: when compiling on non-native archs.
+
+ at DPATCH@
+diff -urNad coq-8.0pl3+8.1alpha~/Makefile coq-8.0pl3+8.1alpha/Makefile
+--- coq-8.0pl3+8.1alpha~/Makefile	2006-04-07 15:08:12.000000000 +0000
++++ coq-8.0pl3+8.1alpha/Makefile	2006-04-30 11:41:09.000000000 +0000
+@@ -1401,7 +1401,7 @@
+ parsing/grammar.cma: $(GRAMMARCMO)
+ 	$(SHOW)'Testing $@'
+ 	@touch test.ml4
+-	$(HIDE)$(OCAMLOPT) $(OPTFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) $(GRAMMARCMO) -impl" -impl test.ml4 -o test-grammar
++	$(HIDE)$(OCAMLC) $(BYTEFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) $(GRAMMARCMO) -impl" -impl test.ml4 -o test-grammar
+ 	@rm -f test-grammar test.*
+ 	$(SHOW)'OCAMLC -a $@'   
+ 	$(HIDE)$(OCAMLC) $(BYTEFLAGS) $(GRAMMARCMO) -linkall -a -o $@

Propchange: trunk/packages/coq/branches/8.0pl3+8.1alpha/debian/patches/makefile.dpatch
------------------------------------------------------------------------------
    svn:executable = *