[polyml] 07/10: Drop all patches; fixed upstream
James Clarke
jrtc27 at moszumanska.debian.org
Mon Mar 20 19:16:09 UTC 2017
This is an automated email from the git hooks/post-receive script.
jrtc27 pushed a commit to branch debian/experimental
in repository polyml.
commit aa6e3806d3744cf1aa112f40523813a34322b0a8
Author: James Clarke <jrtc27 at debian.org>
Date: Mon Mar 20 17:03:32 2017 +0000
Drop all patches; fixed upstream
---
debian/patches/series | 2 +-
debian/patches/x32.diff | 42 ------------------------------------------
2 files changed, 1 insertion(+), 43 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
index fde71a1..6928140 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-x32.diff
+# No patches
diff --git a/debian/patches/x32.diff b/debian/patches/x32.diff
deleted file mode 100644
index b56582c..0000000
--- a/debian/patches/x32.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: Always include long long Make_fixed_precision
- One of the users of this function is getStatInfo in unix_specific, which
- converts a struct stat's st_nlink. However, on x32, st_nlink is a 64-bit
- quantity (the system call ABI is 64-bit), so there are two problems. Firstly,
- it will be truncated; secondly, since the long and int overloads involve a
- cast to an integer of the same width, compilation fails with an ambiguous
- call.
-Author: James Clarke <jrtc27 at jrtc27.com>
-Forwarded: https://github.com/polyml/polyml/pull/78
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/libpolyml/run_time.cpp
-+++ b/libpolyml/run_time.cpp
-@@ -380,7 +380,6 @@ Handle Make_fixed_precision(TaskData *ta
- return taskData->saveVec.push(TAGGED(uval));
- }
-
--#if (SIZEOF_LONG_LONG != 0) && (SIZEOF_LONG_LONG <= SIZEOF_VOIDP)
- Handle Make_fixed_precision(TaskData *taskData, long long val)
- {
- if (val > MAXTAGGED || val < -MAXTAGGED-1)
-@@ -394,7 +393,6 @@ Handle Make_fixed_precision(TaskData *ta
- raise_exception0(taskData, EXC_overflow);
- return taskData->saveVec.push(TAGGED(uval));
- }
--#endif
-
- Handle Make_sysword(TaskData *taskData, uintptr_t p)
- {
---- a/libpolyml/run_time.h
-+++ b/libpolyml/run_time.h
-@@ -86,10 +86,8 @@ extern Handle Make_fixed_precision(TaskD
- extern Handle Make_fixed_precision(TaskData *taskData, int);
- extern Handle Make_fixed_precision(TaskData *taskData, unsigned);
-
--#if (SIZEOF_LONG_LONG != 0) && (SIZEOF_LONG_LONG <= SIZEOF_VOIDP)
- extern Handle Make_fixed_precision(TaskData *taskData, long long);
- extern Handle Make_fixed_precision(TaskData *taskData, unsigned long long);
--#endif
-
- extern Handle Make_sysword(TaskData *taskData, uintptr_t p);
-
--
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