diff options
| author |  Stephane Glondu <steph@glondu.net> | 2012-12-29 10:59:02 +0100 |
|---|---|---|
| committer | Stephane Glondu <steph@glondu.net> | 2012-12-29 10:59:02 +0100 |
| commit | 310693f95754bff6577f0ab933e00190f9b4083b (patch) | |
| tree | 8d5b4a10406bb4ab703354d2a8ef07083b50809b | |
| parent | eddfbb4299e1707e7b0e2347a089fde045ed0e24 (diff) | |
Refresh patches
| -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, 0 insertions, 47 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 deleted file mode 100644 index 8e9b9ee6..00000000 --- a/debian/patches/0002-Fix-use-of-HASNATDYNLINK-in-coq_makefile-output.patch +++ /dev/null @@ -1,46 +0,0 @@ -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 f1d97c91..53d51a16 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 0001-test-suite-success-Nsatz.v-comment-out-Ceva.patch -0002-Fix-use-of-HASNATDYNLINK-in-coq_makefile-output.patch |