Install cmxa only on native archs.

3 files changed, 26 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 375de7f2..33649393 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
 coq (8.1+dfsg-2) UNRELEASED; urgency=low
 
+  * Added cmxa-install.dpatch to install cmxa only on native archs.
   * Added configure.dpatch for the configure to correctly detect whether
     ocamlopt is present or not.
 
- -- Samuel Mimram <smimram@debian.org>  Thu, 15 Feb 2007 13:00:45 +0000
+ -- Samuel Mimram <smimram@debian.org>  Sun, 18 Feb 2007 13:28:11 +0100
 
 coq (8.1+dfsg-1) experimental; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 7f4a29f0..bbb91a76 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -3,3 +3,4 @@ browser
 makefile
 no-complexity-test
 configure
+cmxa-install
diff --git a/debian/patches/cmxa-install.dpatch b/debian/patches/cmxa-install.dpatch
new file mode 100755
index 00000000..7e8d2ffb
--- /dev/null
+++ b/debian/patches/cmxa-install.dpatch
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## cmxa-install.dpatch by Samuel Mimram <smimram@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: .cmxa are not generated on non-native archs, so don't install them.
+
+@DPATCH@
+diff -urNad coq-8.1+dfsg~/Makefile coq-8.1+dfsg/Makefile
+--- coq-8.1+dfsg~/Makefile	2007-02-18 13:25:29.000000000 +0100
++++ coq-8.1+dfsg/Makefile	2007-02-18 13:27:28.000000000 +0100
+@@ -1272,7 +1272,11 @@
+         parsing/parsing.cma tactics/tactics.cma toplevel/toplevel.cma \
+         parsing/highparsing.cma tactics/hightactics.cma contrib/contrib.cma
+ 
+-OBJECTCMXA=$(OBJECTCMA:.cma=.cmxa)
++ifeq ($(BEST),opt)
++  OBJECTCMXA=$(OBJECTCMA:.cma=.cmxa)
++else
++  OBJECTCMXA=
++endif
+ 
+ install-library:
+ 	$(MKDIR) $(FULLCOQLIB)