diff options
| author |  Stephane Glondu <steph@glondu.net> | 2012-09-22 12:31:59 +0200 |
|---|---|---|
| committer | Stephane Glondu <steph@glondu.net> | 2012-09-22 12:51:26 +0200 |
| commit | dcdaa8517bfaedcf4ce97380d39011d976fc1b64 (patch) | |
| tree | 17e03b2777b9afeb51975b44d7493cccc43ec077 | |
| parent | e0356f0d6ec9310a3863f1983f7264847be3c274 (diff) | |
Upstream bugfix: Fix use of $(HASNATDYNLINK) in coq_makefile output
| -rw-r--r-- | debian/patches/0002-Fix-use-of-HASNATDYNLINK-in-coq_makefile-output.patch | 46 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 47 insertions, 0 deletions
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 index 53d51a16..f1d97c91 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-test-suite-success-Nsatz.v-comment-out-Ceva.patch +0002-Fix-use-of-HASNATDYNLINK-in-coq_makefile-output.patch |