[med-svn] [e-mem] 01/01: Revert restrictions to certain architectures and drop -mpopcnt option instead.

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository e-mem.

commit a355ff868d3ab1c6ffb869d796e7b47ac4d9c484
Author: Andreas Tille <tille at debian.org>
Date:   Mon May 8 08:30:04 2017 +0200

    Revert restrictions to certain architectures and drop -mpopcnt option instead.
---
 debian/changelog                                  |  8 ++++++++
 debian/control                                    |  2 +-
 debian/patches/remove_unused_mpopcnt_option.patch | 23 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 4 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e082226..3fd6918 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+e-mem (0.0+20160706-3) unstable; urgency=medium
+
+  * Revert restrictions to certain architectures and drop -mpopcnt option
+    instead.  Thanks for the hint to Adrian Bunk <bunk at debian.org>.
+    Closes: #861911
+
+ -- Andreas Tille <tille at debian.org>  Mon, 08 May 2017 08:29:56 +0200
+
 e-mem (0.0+20160706-2) unstable; urgency=medium
 
   * Restrict architectures to any-amd64 any-i386 any-x32
diff --git a/debian/control b/debian/control
index 5a7c6c1..fad0ad2 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Git: https://anonscm.debian.org/git/debian-med/e-mem.git
 Homepage: http://www.csd.uwo.ca/~ilie/E-MEM/
 
 Package: e-mem
-Architecture: any-amd64 any-i386 any-x32
+Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Enhances: mummer
diff --git a/debian/patches/remove_unused_mpopcnt_option.patch b/debian/patches/remove_unused_mpopcnt_option.patch
new file mode 100644
index 0000000..7aa56b2
--- /dev/null
+++ b/debian/patches/remove_unused_mpopcnt_option.patch
@@ -0,0 +1,23 @@
+Author: Adrian Bunk <bunk at debian.org>
+Bug-Debian: https://bugs.debian.org/861911
+Last-Update: Sun, 7 May 2017 20:23:35 +0300
+Description: Software in Debian is supposed to run on the baseline of the
+ architecture, and not unconditionally require more recent CPUs.
+ .
+ The package builds just fine for me after removing the -mpopcnt from th
+ Makefile, and this is the correct fix.
+ .
+ Disassembling the binary in unstable reveals that gcc did not em
+ any popcnt instructions on amd64.
+
+--- a/Makefile
++++ b/Makefile
+@@ -4,7 +4,7 @@ endif
+ 
+ CC        = g++
+ EXEC      = e-mem
+-CFLAGS   += -Wall -Wextra -Wunused -mpopcnt -std=gnu++0x -fopenmp 
++CFLAGS   += -Wall -Wextra -Wunused -std=gnu++0x -fopenmp 
+ CDEBUG    = -g -ggdb -DDEBUG 
+ CPROF    = -g -ggdb -DDEBUG -pg 
+ COPTIMIZE = -Wuninitialized -O3 -fomit-frame-pointer
diff --git a/debian/patches/series b/debian/patches/series
index f361265..ae556f7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix_test_script.patch
 hardening.patch
+remove_unused_mpopcnt_option.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/e-mem.git