[med-svn] [kmc] 01/01: Use standard compiler environment variables

[Kevin Murray]

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

daube-guest pushed a commit to branch daube/libkmcdev
in repository kmc.

commit 2e0c3ddfb687f6ec0670f42b3fae4de7a7dabe41
Author: Kevin Murray <spam at kdmurray.id.au>
Date:   Fri Oct 2 12:48:17 2015 +1000

    Use standard compiler environment variables
---
 ...e-standard-compiler-environment-variables.patch | 60 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 61 insertions(+)

diff --git a/debian/patches/0007-Use-standard-compiler-environment-variables.patch b/debian/patches/0007-Use-standard-compiler-environment-variables.patch
new file mode 100644
index 0000000..ca45b17
--- /dev/null
+++ b/debian/patches/0007-Use-standard-compiler-environment-variables.patch
@@ -0,0 +1,60 @@
+From: Kevin Murray <spam at kdmurray.id.au>
+Date: Fri, 2 Oct 2015 12:47:14 +1000
+Subject: Use standard compiler environment variables
+
+- CXX for g++, not CC
+- LDFLAGS for the linker
+- CXXFLAGS not CFLAGS for C++ compilation
+---
+ makefile | 22 ++++++++--------------
+ 1 file changed, 8 insertions(+), 14 deletions(-)
+
+diff --git a/makefile b/makefile
+index ff7357d..55f87ca 100644
+--- a/makefile
++++ b/makefile
+@@ -3,11 +3,10 @@ KMC_MAIN_DIR = kmer_counter
+ KMC_API_DIR = kmc_api
+ KMC_DUMP_DIR = kmc_dump
+ 
+-CC = g++
+-CFLAGS	+= -Wall -O3 -fopenmp -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -std=c++11
+-CLINK	= -lm -lz -lbz2 -fopenmp -O3 -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -std=c++11
+-
+-DISABLE_ASMLIB = true
++CXX      := g++
++CXXFLAGS += -Wall -O3 -fopenmp -std=c++11
++LDFLAGS  += -lm -lz -lbz2 -fopenmp -lpthread
++CPPFLAGS += -DDISABLE_ASMLIB
+ 
+ KMC_OBJS = \
+ $(KMC_MAIN_DIR)/kmer_counter.o \
+@@ -33,24 +32,19 @@ $(KMC_DUMP_DIR)/nc_utils.o \
+ $(KMC_DUMP_DIR)/kmc_dump.o \
+ $(KMC_LIB_OBJS)
+ 
+-ifeq ($(DISABLE_ASMLIB),true)
+-	CFLAGS += -DDISABLE_ASMLIB
+-else
+-	KMC_LIBS += \
+-	$(KMC_MAIN_DIR)/libs/alibelf64.a
+-endif
+ 
+ all: kmc kmc_dump libkmc.a
+ 
+ .cpp.o:
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
+ 
+ kmc: $(KMC_OBJS)
+ 	-mkdir -p $(KMC_BIN_DIR)
+-	$(CC) $(LDFLAGS) $(CLINK) -o $(KMC_BIN_DIR)/$@ $^
++	$(CXX) $(LDFLAGS) -o $(KMC_BIN_DIR)/$@ $^
++
+ kmc_dump: $(KMC_DUMP_OBJS)
+ 	-mkdir -p $(KMC_BIN_DIR)
+-	$(CC) $(LDFLAGS) $(CLINK) -o $(KMC_BIN_DIR)/$@ $^
++	$(CXX) $(LDFLAGS) -o $(KMC_BIN_DIR)/$@ $^
+ 
+ libkmc.a: $(KMC_LIB_OBJS)
+ 	ar rcs $@ $^
diff --git a/debian/patches/series b/debian/patches/series
index 8c00acc..ec6ced3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ allow-dry-clean
 hardening
 0005-Add-static-library-target-to-makefile.patch
 0006-Fix-wildcard-to-define-libkmc-objects.patch
+0007-Use-standard-compiler-environment-variables.patch

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