[polyml] 02/07: Added patch polyc-it.diff: Don't set "it" in polyc

James Clarke jrtc27-guest at moszumanska.debian.org
Mon Apr 25 20:35:51 UTC 2016


This is an automated email from the git hooks/post-receive script.

jrtc27-guest pushed a commit to branch master
in repository polyml.

commit da3180cfd49f32d1dabdb6d2e77a24fc7c9b0588
Author: James Clarke <jrtc27 at jrtc27.com>
Date:   Mon Apr 25 20:44:55 2016 +0100

    Added patch polyc-it.diff: Don't set "it" in polyc
---
 debian/changelog             |  3 +++
 debian/patches/polyc-it.diff | 19 +++++++++++++++++++
 debian/patches/series        |  1 +
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index de7c2b3..56621eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 polyml (5.6-6) UNRELEASED; urgency=medium
 
   * Added autopkgtest support for upstream's test suite
+  * New patches:
+    - polyc-it.diff: Don't set "it" in polyc. This fixes the test suite when
+    compiled with polyc.
 
  -- James Clarke <jrtc27 at jrtc27.com>  Mon, 25 Apr 2016 19:38:35 +0100
 
diff --git a/debian/patches/polyc-it.diff b/debian/patches/polyc-it.diff
new file mode 100644
index 0000000..7469594
--- /dev/null
+++ b/debian/patches/polyc-it.diff
@@ -0,0 +1,19 @@
+Description: Don't set "it" in polyc
+ This stops polyc from setting (and potentially shadowing) the implicit it
+ variable, allowing Tests/Fail/Test071.ML to pass when the test suite is
+ compiled with polyc.
+Author: James Clarke <jrtc27 at jrtc27.com>
+Forwarded: https://github.com/polyml/polyml/pull/55
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/polyc.in
++++ b/polyc.in
+@@ -36,7 +36,7 @@
+ 
+ compile()
+ {
+-    echo "use (List.nth(CommandLine.arguments(), 2)); PolyML.export(List.nth(CommandLine.arguments(), 3), main);" | ${COMPILER} -q --error-exit  "$1" "$2"
++    echo "val () = use (List.nth(CommandLine.arguments(), 2)); val () = PolyML.export(List.nth(CommandLine.arguments(), 3), main);" | ${COMPILER} -q --error-exit  "$1" "$2"
+ }
+ 
+ link()
diff --git a/debian/patches/series b/debian/patches/series
index d44a58f..b2a7f49 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,3 +24,4 @@ sparc64.diff
 sh.diff
 hppa.diff
 thread-exited-interrupt-requested-overlap.diff
+polyc-it.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/polyml.git



More information about the debian-science-commits mailing list