Control: tags -1 patch pending

Hi,

Attached is an NMU patch which corrects the problem in this bug.  This is
related to the fact that the test suite (and only the test suite) relies on
SSE2 for i386 (which should be no issue for the buildds).

I have uploaded this to unstable.

Thanks,

Daniel.

-- 
Daniel Silverstone                         http://www.digital-scurf.org/
PGP mail accepted and encouraged.            Key Id: 3CCE BABE 206C 3B69
diff -Nru jemalloc-3.6.0/debian/changelog jemalloc-3.6.0/debian/changelog
--- jemalloc-3.6.0/debian/changelog	2016-01-27 21:20:33.000000000 +0000
+++ jemalloc-3.6.0/debian/changelog	2017-01-28 17:21:21.000000000 +0000
@@ -1,3 +1,12 @@
+jemalloc (3.6.0-9.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add testflags.patch which adds a TESTFLAGS env var support when
+    compiling tests.
+  * Add -msse4.1 to i386 TESTFLAGS (Closes: #834746)
+
+ -- Daniel Silverstone <dsilv...@digital-scurf.org>  Sat, 28 Jan 2017 17:21:21 +0000
+
 jemalloc (3.6.0-9) unstable; urgency=medium
 
   [ Balint Reczey ]
diff -Nru jemalloc-3.6.0/debian/patches/series jemalloc-3.6.0/debian/patches/series
--- jemalloc-3.6.0/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ jemalloc-3.6.0/debian/patches/series	2017-01-28 17:07:36.000000000 +0000
@@ -0,0 +1 @@
+testflags.patch
diff -Nru jemalloc-3.6.0/debian/patches/testflags.patch jemalloc-3.6.0/debian/patches/testflags.patch
--- jemalloc-3.6.0/debian/patches/testflags.patch	1970-01-01 01:00:00.000000000 +0100
+++ jemalloc-3.6.0/debian/patches/testflags.patch	2017-01-28 17:20:53.000000000 +0000
@@ -0,0 +1,31 @@
+Description: Add support for TESTFLAGS
+ Add support to Makefile.in to allow passing TESTFLAGS to give
+ extra CFLAGS to the compilation of test files.
+Author: Daniel Silverstone <dsilv...@digital-scurf.org>
+Origin: other
+Bug: 834746
+Forwarded: no
+Reviewed-by: Steve McIntyre <st...@einval.com>
+Last-Update: 2017-01-28
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -207,7 +207,7 @@
+ $(C_UTIL_INTEGRATION_OBJS): $(objroot)src/%.integration.$(O): $(srcroot)src/%.c
+ $(C_TESTLIB_STRESS_OBJS): $(objroot)test/src/%.stress.$(O): $(srcroot)test/src/%.c
+ $(C_TESTLIB_STRESS_OBJS): CPPFLAGS += -DJEMALLOC_STRESS_TEST -DJEMALLOC_STRESS_TESTLIB
+-$(C_TESTLIB_OBJS): CPPFLAGS += -I$(srcroot)test/include -I$(objroot)test/include
++$(C_TESTLIB_OBJS): CPPFLAGS += -I$(srcroot)test/include -I$(objroot)test/include $(TESTFLAGS)
+ $(TESTS_UNIT_OBJS): CPPFLAGS += -DJEMALLOC_UNIT_TEST
+ $(TESTS_UNIT_AUX_OBJS): CPPFLAGS += -DJEMALLOC_UNIT_TEST
+ define make-unit-link-dep
+@@ -218,7 +218,7 @@
+ $(TESTS_INTEGRATION_OBJS): CPPFLAGS += -DJEMALLOC_INTEGRATION_TEST
+ $(TESTS_STRESS_OBJS): CPPFLAGS += -DJEMALLOC_STRESS_TEST
+ $(TESTS_OBJS): $(objroot)test/%.$(O): $(srcroot)test/%.c
+-$(TESTS_OBJS): CPPFLAGS += -I$(srcroot)test/include -I$(objroot)test/include
++$(TESTS_OBJS): CPPFLAGS += -I$(srcroot)test/include -I$(objroot)test/include $(TESTFLAGS)
+ ifneq ($(IMPORTLIB),$(SO))
+ $(C_OBJS): CPPFLAGS += -DDLLEXPORT
+ endif
diff -Nru jemalloc-3.6.0/debian/rules jemalloc-3.6.0/debian/rules
--- jemalloc-3.6.0/debian/rules	2016-01-27 21:16:22.000000000 +0000
+++ jemalloc-3.6.0/debian/rules	2017-01-28 17:21:21.000000000 +0000
@@ -27,6 +27,12 @@
   DEB_CPPFLAGS_MAINT_APPEND += -DPATH_MAX=8192
 endif
 
+ifeq ($(DEB_HOST_ARCH),i386)
+  # i386 needs -msse4.1 in order to be able to run the test suite
+  # and as far as we can tell, *ONLY* the test suite
+  TESTFLAGS += -msse4.1
+endif
+
 DEB_CFLAGS_MAINT_APPEND += -std=gnu99
 
 export DEB_CFLAGS_MAINT_APPEND DEB_CPPFLAGS_MAINT_APPEND
@@ -40,7 +46,7 @@
 ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 export ASAN_OPTIONS = suppressions=$(CURDIR)/debian/asan-suppressions.txt
 override_dh_auto_test:
-	make check
+	make check "TESTFLAGS=$(TESTFLAGS)"
 endif
 
 override_dh_auto_install:

Reply via email to