From e49db317e080763e29bdd651166293d71ca59ee8 Mon Sep 17 00:00:00 2001 From: Adam Novak Date: Thu, 19 Sep 2024 10:42:38 -0400 Subject: [PATCH] Remove no-longer-needed kff CMake patching The upstream problem we're working around was fixed in https://github.com/Kmer-File-Format/kff-cpp-api/commit/2a5ede6a11bde054f5304e95b69252e9cdfb7e0b, and manually editing the CMakeLists.txt upsets git when we go to change submodule versions. --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c0becd6407..67c1e556f0 100644 --- a/Makefile +++ b/Makefile @@ -613,12 +613,11 @@ endif $(INC_DIR)/kff_io.hpp: $(LIB_DIR)/libkff.a -# We need to drop the hardcoderd CMAKE_CXX_FLAGS. See $(LIB_DIR)/libkff.a: $(KFF_DIR)/kff_io.cpp $(KFF_DIR)/kff_io.hpp.in ifeq ($(shell uname -s),Darwin) - +. ./source_me.sh && cd $(KFF_DIR) && sed -i.bak '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt && rm -Rf build && mkdir build && cd build && cmake -DCMAKE_CXX_FLAGS="-fPIC -Wall -Ofast -g $(CXXFLAGS)" .. && AS_INTEGRATED_ASSEMBLER=1 $(MAKE) $(FILTER) && cp kff_io.hpp $(CWD)/$(INC_DIR) && mv libkff.a $(CWD)/$(LIB_DIR) + +. ./source_me.sh && cd $(KFF_DIR) && rm -Rf build && mkdir build && cd build && cmake -DCMAKE_CXX_FLAGS="-fPIC -Wall -Ofast -g $(CXXFLAGS)" .. && AS_INTEGRATED_ASSEMBLER=1 $(MAKE) $(FILTER) && cp kff_io.hpp $(CWD)/$(INC_DIR) && mv libkff.a $(CWD)/$(LIB_DIR) else - +. ./source_me.sh && cd $(KFF_DIR) && sed -i.bak '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt && rm -Rf build && mkdir build && cd build && cmake -DCMAKE_CXX_FLAGS="-fPIC -Wall -Ofast -g $(CXXFLAGS)" .. && $(MAKE) $(FILTER) && cp kff_io.hpp $(CWD)/$(INC_DIR) && mv libkff.a $(CWD)/$(LIB_DIR) + +. ./source_me.sh && cd $(KFF_DIR) && rm -Rf build && mkdir build && cd build && cmake -DCMAKE_CXX_FLAGS="-fPIC -Wall -Ofast -g $(CXXFLAGS)" .. && $(MAKE) $(FILTER) && cp kff_io.hpp $(CWD)/$(INC_DIR) && mv libkff.a $(CWD)/$(LIB_DIR) endif $(INC_DIR)/BooPHF.h: $(BBHASH_DIR)/BooPHF.h