Source: highwayhash Tags: patch ftbfs Hi,
highwayhash currently FTBFS on most archs, because at Line 1 of Makefile: # We assume X64 unless HH_POWER, HH_ARM, or HH_AARCH64 are defined. This, however, is unnecessary since highwayhash already comes with a portable version of backend. Please consider apply this patch to fix this problem (symbols not updated).
diff --git a/Makefile b/Makefile index 67a2a5b..8a63f4b 100644 --- a/Makefile +++ b/Makefile @@ -32,22 +32,21 @@ HH_AARCH64 = 1 endif ifdef HH_AARCH64 -HH_X64 = HIGHWAYHASH_OBJS += obj/hh_neon.o HIGHWAYHASH_TEST_OBJS += obj/highwayhash_test_neon.o VECTOR_TEST_OBJS += obj/vector_test_neon.o else ifdef HH_POWER -HH_X64 = HIGHWAYHASH_OBJS += obj/hh_vsx.o HIGHWAYHASH_TEST_OBJS += obj/highwayhash_test_vsx.o else -HH_X64 = 1 +ifdef HH_X64 HIGHWAYHASH_OBJS += obj/hh_avx2.o obj/hh_sse41.o HIGHWAYHASH_TEST_OBJS += obj/highwayhash_test_avx2.o obj/highwayhash_test_sse41.o VECTOR_TEST_OBJS += obj/vector_test_avx2.o obj/vector_test_sse41.o endif endif +endif # In case highwayhash_test defines PRINT_RESULTS. HIGHWAYHASH_TEST_OBJS += $(HIGHWAYHASH_OBJS) diff --git a/debian/rules b/debian/rules index d42949a..00fbbc9 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,12 @@ export LIBDIR=$(DESTDIR)/lib/$(DEB_HOST_MULTIARCH)/ export INCDIR=$(DESTDIR)/include/ TESTBINS = highwayhash_test nanobenchmark_example profiler_example sip_hash_test vector_test +ifneq (,$(filter $(DEB_BUILD_ARCH),amd64)) +export HH_X64=1 +endif +ifneq (,$(filter $(DEB_BUILD_ARCH),x32)) +export HH_X64=1 +endif ifneq (,$(filter $(DEB_BUILD_ARCH),arm64)) export HH_AARCH64=1 endif
-- debian-science-maintainers mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
