Control: tags 972217 + patch
Control: tags 972217 + pending

Dear maintainer,

I've prepared an NMU for python-crc32c (versioned as 2.1-1.1) and
uploaded it to DELAYED/3. Please feel free to tell me if I
should delay it longer.

Regards.

SR
diff -Nru python-crc32c-2.1/debian/changelog python-crc32c-2.1/debian/changelog
--- python-crc32c-2.1/debian/changelog	2020-10-02 07:49:26.000000000 -0700
+++ python-crc32c-2.1/debian/changelog	2020-10-17 19:47:59.000000000 -0700
@@ -1,3 +1,10 @@
+python-crc32c (2.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Patch: HWCAP_CRC32 is already defined on arm64. Fixes FTBFS. Closes: #972217
+
+ -- Stefano Rivera <stefa...@debian.org>  Sat, 17 Oct 2020 19:47:59 -0700
+
 python-crc32c (2.1-1) unstable; urgency=medium
 
   [ upstream ]
diff -Nru python-crc32c-2.1/debian/patches/arm64-hwcap-defined.patch python-crc32c-2.1/debian/patches/arm64-hwcap-defined.patch
--- python-crc32c-2.1/debian/patches/arm64-hwcap-defined.patch	1969-12-31 16:00:00.000000000 -0800
+++ python-crc32c-2.1/debian/patches/arm64-hwcap-defined.patch	2020-10-17 19:47:59.000000000 -0700
@@ -0,0 +1,37 @@
+From: Stefano Rivera <stef...@rivera.za.net>
+Date: Sat, 17 Oct 2020 19:35:51 -0700
+Subject: HWCAP_CRC32 is already defined on arm64
+
+On a standard GNU/Linux system, <sys/auxv.h> includes <bits/hwcap.h>
+which defines HWCAP_CRC32.
+
+We probably have no need for a fallback, I'm sure anyone using this
+library will have HWCAP_CRC32 defined, but it doesn't really hurt to
+carry it, either...
+
+Bug-Debian: https://bugs.debian.org/972217
+Forwarded: https://github.com/ICRAR/crc32c/pull/21
+---
+ checkarm.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/checkarm.c b/checkarm.c
+index 7957816..374eeef 100644
+--- a/checkarm.c
++++ b/checkarm.c
+@@ -26,10 +26,13 @@
+ 
+ #include <sys/auxv.h>
+ 
++#ifndef HWCAP_CRC32
++/* see arch/arm64/include/uapi/asm/hwcap.h */
++#define HWCAP_CRC32 (1 << 7)
++#endif
++
+ int _crc32c_arm64_probe(void)
+ {
+-	/* see arch/arm64/include/uapi/asm/hwcap.h */
+-	const unsigned long HWCAP_CRC32 = 1 << 7;
+ 	unsigned long auxval;
+ 	auxval = getauxval(AT_HWCAP);
+ 	return (auxval & HWCAP_CRC32) != 0;
diff -Nru python-crc32c-2.1/debian/patches/series python-crc32c-2.1/debian/patches/series
--- python-crc32c-2.1/debian/patches/series	1969-12-31 16:00:00.000000000 -0800
+++ python-crc32c-2.1/debian/patches/series	2020-10-17 19:47:59.000000000 -0700
@@ -0,0 +1 @@
+arm64-hwcap-defined.patch

Reply via email to