[med-svn] [ncbi-vdb] 01/02: Fix two bugs preventing build on i386 and x32

[Andreas Tille]

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

tille pushed a commit to branch master
in repository ncbi-vdb.

commit 163c52cef46f2e0a324c7bd16f3e3268f7884b3d
Author: Andreas Tille <tille at debian.org>
Date:   Wed Aug 31 08:36:15 2016 +0200

    Fix two bugs preventing build on i386 and x32
---
 debian/changelog                      |  9 ++++++
 debian/patches/add_-msse2.patch       | 16 ++++++++++
 debian/patches/remove_-m64_flag.patch | 58 +++++++++++++++++++++++++++++++++++
 debian/patches/series                 |  2 ++
 4 files changed, 85 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 916e91e..8dc8f88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ncbi-vdb (2.7.0+dfsg-2) UNRELEASED; urgency=medium
+
+  * Enable build on x32 by removing explicit -m32/-m64
+    Closes: #836129
+  * Add -msse2 to libs/search
+    Closes: #836128
+
+ -- Andreas Tille <tille at debian.org>  Wed, 31 Aug 2016 07:55:11 +0200
+
 ncbi-vdb (2.7.0+dfsg-1) unstable; urgency=medium
 
   * Initial release (Closes: #832165)
diff --git a/debian/patches/add_-msse2.patch b/debian/patches/add_-msse2.patch
new file mode 100644
index 0000000..44332bc
--- /dev/null
+++ b/debian/patches/add_-msse2.patch
@@ -0,0 +1,16 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Wed, 31 Aug 2016 07:55:11 +0200
+Bug-Debian: https://bugs.debian.org/836128
+Description: Add -msse2 to libs/search
+
+--- a/libs/search/Makefile
++++ b/libs/search/Makefile
+@@ -39,6 +39,8 @@ OBJFILES = \
+ 
+ include $(TOP)/build/Makefile.env
+ 
++CFLAGS += -msse2
++
+ #-------------------------------------------------------------------------------
+ # outer targets
+ #
diff --git a/debian/patches/remove_-m64_flag.patch b/debian/patches/remove_-m64_flag.patch
new file mode 100644
index 0000000..3da738d
--- /dev/null
+++ b/debian/patches/remove_-m64_flag.patch
@@ -0,0 +1,58 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Wed, 31 Aug 2016 07:55:11 +0200
+Bug-Debian: https://bugs.debian.org/836129
+Description: Enable build on x32 by removing explicit -m32/-m64
+
+--- a/build/Makefile.gcc
++++ b/build/Makefile.gcc
+@@ -51,16 +51,6 @@ ifneq (sun,$(OS))
+     WARN += -Wno-variadic-macros
+ endif
+ 
+-ifeq (64,$(BITS))
+-	CARCH = -m64
+-else
+-ifeq (32_64,$(BITS))
+-	CARCH = -arch i386 -arch x86_64  
+-else    
+-	CARCH = -m32
+-endif    
+-endif
+-
+ ifeq (prof, $(BUILD))
+ 	PROF = -pg
+ endif
+--- a/build/Makefile.cc
++++ b/build/Makefile.cc
+@@ -46,12 +46,6 @@ LP = @ $(TOP)/build/ld.sh $(OS) $(ARCH)
+ # tool options
+ WARN =
+ 
+-ifeq (64,$(BITS))
+-	CARCH = -m64
+-else
+-	CARCH = -m32
+-endif
+-
+ ifeq (prof, $(BUILD))
+ 	PROF = -xpg
+ endif
+--- a/build/Makefile.clang
++++ b/build/Makefile.clang
+@@ -48,16 +48,6 @@ LP = @ $(TOP)/build/ld.sh $(OS) $(ARCH)
+ # tool options
+ WARN = -Wall -Wno-variadic-macros -Wno-long-long # -Wconversion
+ 
+-ifeq (64,$(BITS))
+-	CARCH = -m64
+-else
+-ifeq (32_64,$(BITS))
+-	CARCH = -arch i386 -arch x86_64  
+-else    
+-	CARCH = -m32
+-endif    
+-endif
+-
+ ifeq (prof, $(BUILD))
+ 	PROF = -pg
+ endif
diff --git a/debian/patches/series b/debian/patches/series
index 7d3aa9b..5974b97 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,5 @@ skip_failing_test.patch
 fix_install_target.patch
 use_debian_packaged_zlib.patch
 spelling.patch
+remove_-m64_flag.patch
+add_-msse2.patch

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