[lua-torch-torch7] 02/04: rules: revert the removal of several flags

[Zhou Mo]

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

cdluminate-guest pushed a commit to branch master
in repository lua-torch-torch7.

commit b6d9c7dc108a2fd37349cfb13c9f6d7f1f36184d
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Mon May 22 06:52:55 2017 +0000

    rules: revert the removal of several flags
---
 debian/changelog |  2 ++
 debian/rules     | 15 +++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 17f7b02..8ce7c9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 lua-torch-torch7 (0~20170511-gae1a805-3) UNRELEASED; urgency=medium
 
   * Mark SSE/AVX symbols as optional.
+  * Revert the removal of architecture flags in rules. These flags are
+    used by the cmake-disable-simd-* patches.
 
  -- Zhou Mo <cdluminate at gmail.com>  Mon, 22 May 2017 06:49:19 +0000
 
diff --git a/debian/rules b/debian/rules
index f1d965f..3dab17e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,16 @@ TORCH_FLAGS_5_1= \
  -DCMAKE_INSTALL_PREFIX=/usr \
  -DWITH_BLAS=generic
 
+ifeq (amd64,$(DEB_HOST_ARCH))
+ISA_FLAGS= -DDEBIAN_AMD64=ON
+endif
+ifeq (i386,$(DEB_HOST_ARCH))
+ISA_FLAGS= -DDEBIAN_I386=ON
+endif
+ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),arm64 armel armhf))
+ISA_FLAGS= -DDEBIAN_ARM=ON
+endif
+
 %:
 	dh $@ --buildsystem=lua --with=lua
 
@@ -94,3 +104,8 @@ override_dh_auto_clean:
 	-$(RM) -rf deb.test
 	-$(RM) test/*.bin
 	dh_auto_clean
+
+# Note, sed command used to mark SIMD symbols as optional:
+# sed -i -e 's/^ \(.*\)AVX\(.*\)/ (optional)\1AVX\2/g' libtorch-th.symbols
+# sed -i -e 's/^ \(.*\)avx\(.*\)/ (optional)\1avx\2/g' libtorch-th.symbols
+# sed -i -e 's/^ \(.*\)sse\(.*\)/ (optional)\1sse\2/g' libtorch-th.symbols

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/lua-torch-torch7.git