[Pkg-javascript-commits] [node-mapnik] 06/08: Disable SSE on non-amd64 architectures.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository node-mapnik.

commit 5fc5ab9a5b95cff02a0e1df291653c5ae7c7d31d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Mar 4 13:25:04 2018 +0100

    Disable SSE on non-amd64 architectures.
---
 debian/changelog                 |  1 +
 debian/patches/disable-sse.patch | 16 ----------------
 debian/patches/series            |  1 -
 debian/rules                     | 12 ++++++++++--
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 04db32a..b741165 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ node-mapnik (3.7.1+dfsg-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release.
   * Drop patches included upstream. Refresh remaining patches.
+  * Disable SSE on non-amd64 architectures.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 04 Mar 2018 13:19:24 +0100
 
diff --git a/debian/patches/disable-sse.patch b/debian/patches/disable-sse.patch
deleted file mode 100644
index bf5738e..0000000
--- a/debian/patches/disable-sse.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Disable SSE, causes FTBFS on non-amd64.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: not-needed
-Bug-Debian: https://bugs.debian.org/890985
-
---- a/binding.gyp
-+++ b/binding.gyp
-@@ -2,7 +2,7 @@
-   'includes': [ 'common.gypi' ],
-   'variables': {
-       'ENABLE_GLIBC_WORKAROUND%':'false', # can be overriden by a command line variable because of the % sign
--      'enable_sse%':'true' 
-+      'enable_sse%':'false' 
-   },
-   'targets': [
-     {
diff --git a/debian/patches/series b/debian/patches/series
index a4570c5..7483313 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 test_disable_raster_layer.patch
 use-packaged-dependencies.patch
 no-mason.patch
-disable-sse.patch
diff --git a/debian/rules b/debian/rules
index e3c5207..bee2c60 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,14 +7,22 @@
 # Verbose output
 export V=1
 
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+# Disable SSE on non-amd64 architectures.
+export SSE_MATH=true
+ifeq (,$(findstring $(DEB_BUILD_ARCH),"amd64"))
+	export SSE_MATH=false
+endif
+
 %:
 	dh $@ --parallel --with nodejs
 
 override_dh_auto_configure:
-	node-pre-gyp configure
+	node-pre-gyp configure --enable_sse=$(SSE_MATH)
 
 override_dh_auto_build:
-	node-pre-gyp build
+	node-pre-gyp build --enable_sse=$(SSE_MATH)
 
 override_dh_auto_install:
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/node-mapnik.git