diff options
Diffstat (limited to 'debian/patches')
3 files changed, 78 insertions, 0 deletions
diff --git a/debian/patches/0001-test-suite-success-Nsatz.v-comment-out-Ceva.patch b/debian/patches/0001-test-suite-success-Nsatz.v-comment-out-Ceva.patch new file mode 100644 index 00000000..722ab00c --- /dev/null +++ b/debian/patches/0001-test-suite-success-Nsatz.v-comment-out-Ceva.patch @@ -0,0 +1,30 @@ +From: Stephane Glondu <steph@glondu.net> +Date: Sun, 15 Jan 2012 12:34:19 +0100 +Subject: test-suite/success/Nsatz.v: comment out Ceva + +This lemma uses too much memory for many buildds... +--- + test-suite/success/Nsatz.v | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/test-suite/success/Nsatz.v b/test-suite/success/Nsatz.v +index d316e4a..d783b2a 100644 +--- a/test-suite/success/Nsatz.v ++++ b/test-suite/success/Nsatz.v +@@ -461,6 +461,7 @@ idtac "chords". + (*Finished transaction in 4. secs (3.959398u,0.s)*) + Qed. + ++(* + Lemma Ceva: forall A B C D E F M:point, + collinear M A D -> collinear M B E -> collinear M C F -> + collinear B C D -> collinear E A C -> collinear F A B -> +@@ -472,6 +473,7 @@ idtac "Ceva". + Time nsatz. + (*Finished transaction in 105. secs (104.121171u,0.474928s)*) + Qed. ++*) + + Lemma bissectrices: forall A B C M:point, + equaltangente C A M M A B -> +-- diff --git a/debian/patches/0002-Fix-use-of-HASNATDYNLINK-in-coq_makefile-output.patch b/debian/patches/0002-Fix-use-of-HASNATDYNLINK-in-coq_makefile-output.patch new file mode 100644 index 00000000..8e9b9ee6 --- /dev/null +++ b/debian/patches/0002-Fix-use-of-HASNATDYNLINK-in-coq_makefile-output.patch @@ -0,0 +1,46 @@ +From: Stephane Glondu <steph@glondu.net> +Date: Sat, 22 Sep 2012 12:24:42 +0200 +Subject: Fix use of $(HASNATDYNLINK) in coq_makefile output + +Generated makefiles were broken because + $(if ifeq '$(HASNATDYNLINK)' 'true',X) +always returns X. +--- + tools/coq_makefile.ml | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/tools/coq_makefile.ml b/tools/coq_makefile.ml +index eedbf42..bc38136 100644 +--- a/tools/coq_makefile.ml ++++ b/tools/coq_makefile.ml +@@ -222,7 +222,7 @@ let install (vfiles,(mlifiles,ml4files,mlfiles,mllibfiles,mlpackfiles),_,sds) in + print "\n"; + end; + print "install:"; +- if (not_empty cmxsfiles) then print "$(if ifeq '$(HASNATDYNLINK)' 'true',install-natdynlink)"; ++ if (not_empty cmxsfiles) then print "$(if $(HASNATDYNLINK_OR_EMPTY),install-natdynlink)"; + print "\n"; + if not_empty vfiles then install_include_by_root "VOFILES" vfiles inc; + if (not_empty cmofiles) then +@@ -543,14 +543,18 @@ let main_targets vfiles (mlifiles,ml4files,mlfiles,mllibfiles,mlpackfiles) other + print "CMXSFILES=$(CMXFILES:.cmx=.cmxs) $(CMXAFILES:.cmxa=.cmxs)\n"; + classify_files_by_root "CMXSFILES" (l1@l2) inc; + end; +- print "\n"; ++ print "ifeq '$(HASNATDYNLINK)' 'true'\n"; ++ print "HASNATDYNLINK_OR_EMPTY := yes\n"; ++ print "else\n"; ++ print "HASNATDYNLINK_OR_EMPTY :=\n"; ++ print "endif\n\n"; + section "Definition of the toplevel targets."; + print "all: "; + if !some_vfile then print "$(VOFILES) "; + if !some_mlfile || !some_ml4file || !some_mlpackfile then print "$(CMOFILES) "; + if !some_mllibfile then print "$(CMAFILES) "; + if !some_mlfile || !some_ml4file || !some_mllibfile || !some_mlpackfile +- then print "$(if ifeq '$(HASNATDYNLINK)' 'true',$(CMXSFILES)) "; ++ then print "$(if $(HASNATDYNLINK_OR_EMPTY),$(CMXSFILES)) "; + print_list "\\\n " other_targets; print "\n\n"; + if !some_mlifile then + begin +-- diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..f1d97c91 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +0001-test-suite-success-Nsatz.v-comment-out-Ceva.patch +0002-Fix-use-of-HASNATDYNLINK-in-coq_makefile-output.patch |