Commit cb6788f7752b9df0129e19d797f0c795e5e7bf5f - kmc

general build flags cleanup Étienne Mollier 3 years ago

2 changed file(s) with 18 addition(s) and 13 deletion(s). Raw diff Collapse all Expand all

-4

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

14	14	KMC_MAIN_DIR = kmer_counter
15	15	@@ -9,6 +9,7 @@
16	16
17		KMC_TOOLS_CXXFLAGS := $(CXXFLAGS) -Wall -O3 -m64 -static -lpthread -std=c++14
18		KMC_TOOLS_LDFLAGS := $(LDFLAGS) -lm -static -O3 -lpthread -std=c++14
	17	KMC_TOOLS_CXXFLAGS := $(CXXFLAGS) -Wall -O3 -m64
	18	KMC_TOOLS_LDFLAGS := $(LDFLAGS) -lm -O3 -lpthread -std=c++14 -lz -lbz2
19	19	+KMC_LIB_OBJS = $(sort $(wildcard $(KMC_API_DIR)/*.o))
20	20
21		CXXFLAGS += -Wall -O3 -m64 -static -lpthread -std=c++11
22		LDFLAGS += -lm -static -O3 -lpthread -std=c++11
	21	CXXFLAGS += -Wall -O3 -m64
	22	LDFLAGS += -lm -O3 -lpthread -std=c++11 -lz -lbz2
23	23	@@ -97,6 +98,10 @@
24	24	-I `python3 -c "import sysconfig;print(sysconfig.get_paths()['include'])"` \
25	25	-o $(KMC_BIN_DIR)/$@`python3-config --extension-suffix`

31	31	clean:
32	32	-rm -f $(KMC_MAIN_DIR)/*.o
33	33	-rm -f $(KMC_API_DIR)/*.o
	34	@@ -105,3 +110,4 @@
	35	-rm -f $(PY_KMC_API_DIR)/*.o
	36	-rm -f $(PY_KMC_API_DIR)/*.so
	37	-rm -rf bin
	38	+ -rm -f libkmc.a

-9

debian/patches/makefile.patch less more

13	13	-CC = g++
14	14	-CFLAGS = -Wall -O3 -m64 -static -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -std=c++11
15	15	-CLINK = -lm -static -O3 -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -std=c++11
16		+KMC_TOOLS_CXXFLAGS := $(CXXFLAGS) -Wall -O3 -m64 -static -lpthread -std=c++14
17		+KMC_TOOLS_LDFLAGS := $(LDFLAGS) -lm -static -O3 -lpthread -std=c++14
	16	+KMC_TOOLS_CXXFLAGS := $(CXXFLAGS) -Wall -O3 -m64
	17	+KMC_TOOLS_LDFLAGS := $(LDFLAGS) -lm -O3 -lpthread -std=c++14 -lz -lbz2
18	18
19	19	-KMC_TOOLS_CFLAGS = -Wall -O3 -m64 -static -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -std=c++14
20	20	-KMC_TOOLS_CLINK = -lm -static -O3 -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -std=c++14
21		+CXXFLAGS += -Wall -O3 -m64 -static -lpthread -std=c++11
22		+LDFLAGS += -lm -static -O3 -lpthread -std=c++11
	21	+CXXFLAGS += -Wall -O3 -m64
	22	+LDFLAGS += -lm -O3 -lpthread -std=c++11 -lz -lbz2
23	23
24	24	KMC_OBJS = \
25	25	$(KMC_MAIN_DIR)/kmer_counter.o \

50	50	kmc: $(KMC_OBJS) $(RADULS_OBJS)
51	51	-mkdir -p $(KMC_BIN_DIR)
52	52	- $(CC) $(CLINK) -o $(KMC_BIN_DIR)/$@ $^ $(KMC_LIBS)
53		+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $(KMC_BIN_DIR)/$@ $^ $(LDFLAGS)
	53	+ $(CXX) $(CXXFLAGS) -o $(KMC_BIN_DIR)/$@ $^ $(LDFLAGS)
54	54
55	55	kmc_dump: $(KMC_DUMP_OBJS) $(KMC_API_OBJS)
56	56	-mkdir -p $(KMC_BIN_DIR)
57	57	- $(CC) $(CLINK) -o $(KMC_BIN_DIR)/$@ $^
58		+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $(KMC_BIN_DIR)/$@ $^ $(LDFLAGS)
	58	+ $(CXX) $(CXXFLAGS) -o $(KMC_BIN_DIR)/$@ $^ $(LDFLAGS)
59	59
60	60	kmc_tools: $(KMC_TOOLS_OBJS) $(KMC_API_OBJS)
61	61	-mkdir -p $(KMC_BIN_DIR)
62	62	- $(CC) $(KMC_TOOLS_CLINK) -o $(KMC_BIN_DIR)/$@ $^ $(KMC_TOOLS_LIBS)
63		+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $(KMC_BIN_DIR)/$@ $^ $(KMC_TOOLS_LDFLAGS)
	63	+ $(CXX) $(CXXFLAGS) -o $(KMC_BIN_DIR)/$@ $^ $(KMC_TOOLS_LDFLAGS)
64	64
65	65	$(PY_KMC_API_DIR)/%.o: $(KMC_API_DIR)/%.cpp
66	66	- $(CC) -c -fPIC -Wall -O3 -m64 -std=c++11 $^ -o $@
67		+ $(CXX) -c -fPIC -Wall -O3 -m64 -std=c++11 $^ -o $@
	67	+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -fPIC -Wall -O3 -m64 -std=c++11 $^ -o $@
68	68
69	69	py_kmc_api: $(PY_KMC_API_OBJS) $(PY_KMC_API_OBJS)
70	70	-mkdir -p $(KMC_BIN_DIR)
71	71	- $(CC) -fPIC -Wall -shared -std=c++11 -O3 $(PY_KMC_API_DIR)/py_kmc_api.cpp $(PY_KMC_API_OBJS) \
72		+ $(CXX) -fPIC -Wall -shared -std=c++11 -O3 $(PY_KMC_API_DIR)/py_kmc_api.cpp $(PY_KMC_API_OBJS) \
	72	+ $(CXX) $(CXXFLAGS) -fPIC -Wall -shared -std=c++11 -O3 $(PY_KMC_API_DIR)/py_kmc_api.cpp $(PY_KMC_API_OBJS) \
73	73	-I $(KMC_API_DIR) \
74	74	-I $(PY_KMC_API_DIR)/libs/pybind11/include \
75	75	-I `python3 -c "import sysconfig;print(sysconfig.get_paths()['include'])"` \