Source: marisa
Severity: normal
Tags: patch upstream
User: [email protected]
Usertags: riscv64
Hello,
We need support in this package for the riscv64 architecture.
I am attaching a patch that adds support. It applies cleanly when added last in
the "series" file.
Without it, the tests fail, and it FTBFS.
It would be great if you could include these changes and release a new version
for unstable soonish.
Thanks and cheers.
--
Manuel A. Fernandez Montecelo <[email protected]>
Index: marisa-0.2.4/lib/marisa/base.h
===================================================================
--- marisa-0.2.4.orig/lib/marisa/base.h
+++ marisa-0.2.4/lib/marisa/base.h
@@ -31,6 +31,7 @@ typedef uint64_t marisa_uint64;
#if defined(_WIN64) || defined(__amd64__) || defined(__x86_64__) || \
defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__) || \
( defined(__sparc__) && defined(__arch64__) ) || \
+ ( defined(__riscv) && (__riscv_xlen == 64) ) || \
defined(__mips64) || defined(__aarch64__) || defined(__s390x__)
#define MARISA_WORD_SIZE 64
#else // defined(_WIN64), etc.
diff -Nru marisa-0.2.4/debian/changelog marisa-0.2.4/debian/changelog
--- marisa-0.2.4/debian/changelog 2014-10-11 16:08:17.000000000 +0200
+++ marisa-0.2.4/debian/changelog 2018-05-06 01:47:40.000000000 +0200
@@ -1,3 +1,10 @@
+marisa (0.2.4-8+0.riscv64.1) unreleased; urgency=medium
+
+ * Non-maintainer upload.
+ * riscv64: add support for riscv64 to fix tests
+
+ -- Manuel A. Fernandez Montecelo <[email protected]> Sat, 05 May 2018 23:47:40
+0000
+
marisa (0.2.4-8) unstable; urgency=medium
[debian/control]
diff -Nru marisa-0.2.4/debian/patches/riscv64-support.patch
marisa-0.2.4/debian/patches/riscv64-support.patch
--- marisa-0.2.4/debian/patches/riscv64-support.patch 1970-01-01
01:00:00.000000000 +0100
+++ marisa-0.2.4/debian/patches/riscv64-support.patch 2018-05-06
01:47:40.000000000 +0200
@@ -0,0 +1,12 @@
+Index: marisa-0.2.4/lib/marisa/base.h
+===================================================================
+--- marisa-0.2.4.orig/lib/marisa/base.h
++++ marisa-0.2.4/lib/marisa/base.h
+@@ -31,6 +31,7 @@ typedef uint64_t marisa_uint64;
+ #if defined(_WIN64) || defined(__amd64__) || defined(__x86_64__) || \
+ defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__) || \
+ ( defined(__sparc__) && defined(__arch64__) ) || \
++ ( defined(__riscv) && (__riscv_xlen == 64) ) || \
+ defined(__mips64) || defined(__aarch64__) || defined(__s390x__)
+ #define MARISA_WORD_SIZE 64
+ #else // defined(_WIN64), etc.
diff -Nru marisa-0.2.4/debian/patches/series marisa-0.2.4/debian/patches/series
--- marisa-0.2.4/debian/patches/series 2014-09-17 18:05:17.000000000 +0200
+++ marisa-0.2.4/debian/patches/series 2018-05-06 01:47:40.000000000 +0200
@@ -1,3 +1,4 @@
module-version-for-egg-inof.patch
wordsize-test-for-some-archs.patch
support-mips64el.patch
+riscv64-support.patch