[Pkg-ocaml-maint-commits] [SCM] coq packaging branch, master, updated. debian/8.2.beta4+dfsg-1-2-g745e0fb

[Stephane Glondu]

The following commit has been merged in the master branch:
commit c2b0b6213988a0592da8b773064949c637f8b64d
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Aug 15 12:26:18 2008 +0200

    Add non-native-archs.dpatch
    
    Fix FTBFS on non-native architectures (Closes: #495165)

diff --git a/debian/patches/00list b/debian/patches/00list
index 3e9df43..fb3801f 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
 no-complexity-test
 check
 use-env-in-coq-config
+non-native-archs
diff --git a/debian/patches/non-native-archs.dpatch b/debian/patches/non-native-archs.dpatch
new file mode 100755
index 0000000..cbb9f83
--- /dev/null
+++ b/debian/patches/non-native-archs.dpatch
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## non-native-archs.dpatch by Stephane Glondu <steph at glondu.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix FTBFS on non-native architectures
+
+ at DPATCH@
+diff --git a/Makefile.build b/Makefile.build
+index a5bae4e..c47b688 100644
+--- a/Makefile.build
++++ b/Makefile.build
+@@ -655,7 +655,10 @@ install-library:
+ 	$(MKDIR) $(FULLCOQLIB)/states
+ 	$(INSTALLLIB) states/*.coq $(FULLCOQLIB)/states
+ 	$(MKDIR) $(FULLCOQLIB)/user-contrib
+-	$(INSTALLLIB) $(LINKCMO) $(LINKCMX) $(GRAMMARCMA) $(FULLCOQLIB)
++	$(INSTALLLIB) $(LINKCMO) $(GRAMMARCMA) $(FULLCOQLIB)
++ifeq ($(BEST),opt)
++	$(INSTALLLIB) $(LINKCMX) $(FULLCOQLIB)
++endif
+ 	find . -name \*.cmi -exec $(INSTALLLIB) {} $(FULLCOQLIB) \;
+ 
+ install-library-light:
+@@ -716,7 +719,7 @@ dev/printers.cma: $(PRINTERSCMO)
+ 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) $(OPTFLAGS) -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 $@

-- 
coq packaging