[med-svn] [Git][med-team/kmc][master] remove -m64 build option

[Étienne Mollier]

Étienne Mollier pushed to branch master at Debian Med / kmc


Commits:
7f6dd3e1 by Étienne Mollier at 2020-12-11T00:08:52+01:00
remove -m64 build option

It has been put back by error.  Although alone, this does not fix
portability issues, it is one less problem to deal with.

- - - - -


3 changed files:

- debian/changelog
- debian/patches/0005-Add-static-library-target-to-makefile.patch
- debian/patches/makefile.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+kmc (3.1.1+dfsg-2) UNRELEASED; urgency=medium
+
+  * Remove non-portable -m64 flag put back by error.
+
+ -- Étienne Mollier <etienne.mollier at mailoo.org>  Fri, 11 Dec 2020 00:07:16 +0100
+
 kmc (3.1.1+dfsg-1) unstable; urgency=medium
 
   * Added myself to Uploaders.


=====================================
debian/patches/0005-Add-static-library-target-to-makefile.patch
=====================================
@@ -15,11 +15,11 @@ From: Kevin Murray <spam at kdmurray.id.au>
  KMC_MAIN_DIR = kmer_counter
 @@ -9,6 +9,7 @@
  
- KMC_TOOLS_CXXFLAGS := $(CXXFLAGS) -Wall -O3 -m64
+ KMC_TOOLS_CXXFLAGS := $(CXXFLAGS) -Wall -O3
  KMC_TOOLS_LDFLAGS  := $(LDFLAGS) -lm -O3 -lpthread -std=c++14 -lz -lbz2
 +KMC_LIB_OBJS = $(sort $(wildcard $(KMC_API_DIR)/*.o))
  
- CXXFLAGS += -Wall -O3 -m64
+ CXXFLAGS += -Wall -O3
  LDFLAGS  += -lm -O3 -lpthread -std=c++11 -lz -lbz2
 @@ -97,6 +98,10 @@
  	-I `python3 -c "import sysconfig;print(sysconfig.get_paths()['include'])"` \


=====================================
debian/patches/makefile.patch
=====================================
@@ -14,12 +14,12 @@ From: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 -CC 	= g++
 -CFLAGS	= -Wall -O3 -m64 -static -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -std=c++11
 -CLINK	= -lm -static -O3 -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -std=c++11
-+KMC_TOOLS_CXXFLAGS := $(CXXFLAGS) -Wall -O3 -m64
++KMC_TOOLS_CXXFLAGS := $(CXXFLAGS) -Wall -O3
 +KMC_TOOLS_LDFLAGS  := $(LDFLAGS) -lm -O3 -lpthread -std=c++14 -lz -lbz2
  
 -KMC_TOOLS_CFLAGS	= -Wall -O3 -m64 -static -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -std=c++14
 -KMC_TOOLS_CLINK	= -lm -static -O3 -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -std=c++14
-+CXXFLAGS += -Wall -O3 -m64
++CXXFLAGS += -Wall -O3
 +LDFLAGS  += -lm -O3 -lpthread -std=c++11 -lz -lbz2
  
  KMC_OBJS = \
@@ -65,7 +65,7 @@ From: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
  
  $(PY_KMC_API_DIR)/%.o: $(KMC_API_DIR)/%.cpp
 -	$(CC) -c -fPIC -Wall -O3 -m64 -std=c++11 $^ -o $@
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -fPIC -Wall -O3 -m64 -std=c++11 $^ -o $@
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -fPIC -Wall -O3 -std=c++11 $^ -o $@
  
  py_kmc_api: $(PY_KMC_API_OBJS) $(PY_KMC_API_OBJS)
  	-mkdir -p $(KMC_BIN_DIR)



View it on GitLab: https://salsa.debian.org/med-team/kmc/-/commit/7f6dd3e1ee626e102fe8de456e690f33aefa4cbf

-- 
View it on GitLab: https://salsa.debian.org/med-team/kmc/-/commit/7f6dd3e1ee626e102fe8de456e690f33aefa4cbf
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20201210/e448ef4e/attachment-0001.html>