From 57ebf3b953b2b6acf217b6954a9c9a9805ddb4ff Mon Sep 17 00:00:00 2001 From: Amitav Mitra Date: Tue, 11 May 2021 12:02:37 -0400 Subject: [PATCH 1/3] capture MAP_TYPE variable to build with appropriate unordered_map --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 3a1f131..dbcaa80 100644 --- a/Makefile +++ b/Makefile @@ -51,6 +51,10 @@ CXX_FLAGS = -std=c++11 -g -O3 -rdynamic -Wall -MMD -MP -fPIC ${INCLUDE_PATH} -We CXX_FLAGS +=-fno-omit-frame-pointer -Wno-ignored-qualifiers -Werror=return-type -Wextra -Wno-long-long -Winit-self -Wno-unused-local-typedefs -Woverloaded-virtual ${COMPILETIME_ROOT} ${FALLTHROUGH_FLAGS} +ifdef MAP_TYPE +CXX_FLAGS += ${MAP_TYPE} +endif + LINK_LIBRARY_FLAGS = -shared -fPIC -Wall -g -O3 -rdynamic ${LIBRARY_PATH} ${LIBRARIES} -Wl,-rpath=$(RUNTIME_LDPATH)/lib ${COMPILETIME_ROOT} LINK_EXE_FLAGS = -Wall -g -O3 -rdynamic ${LIBRARY_PATH} ${LIBRARIES} \ From 3706d6bc5b5abb916be07ce990f6c80fb692f137 Mon Sep 17 00:00:00 2001 From: Amitav Mitra Date: Thu, 20 May 2021 17:14:07 -0400 Subject: [PATCH 2/3] GCC < 5.0 causes issue with std::put_time, don't feel like solving now --- src/GenericIPBus_device/GenericIPBus_device.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/GenericIPBus_device/GenericIPBus_device.cc b/src/GenericIPBus_device/GenericIPBus_device.cc index 21a5556..448e4f0 100644 --- a/src/GenericIPBus_device/GenericIPBus_device.cc +++ b/src/GenericIPBus_device/GenericIPBus_device.cc @@ -103,6 +103,7 @@ void GenericIPBusDevice::LoadCommandList(){ CommandReturn::status GenericIPBusDevice::DumpDebug(std::vector /*strArg*/, std::vector /*intArg*/){ +/* std::stringstream outfileName; outfileName << "Apollo_debug_dump_"; std::time_t time = std::time(NULL); @@ -112,6 +113,7 @@ CommandReturn::status GenericIPBusDevice::DumpDebug(std::vector /*s std::ofstream outfile(outfileName.str().c_str(),std::ofstream::out); outfile << outfileName.str() << std::endl; SM->DebugDump(outfile); - outfile.close(); + outfile.close(); +*/ return CommandReturn::OK; } From 23717b2f03cdc37b1b7100e24d249f8b248ee0d1 Mon Sep 17 00:00:00 2001 From: Amitav Mitra Date: Fri, 21 May 2021 09:41:24 -0400 Subject: [PATCH 3/3] for some reason installation rules needed to be added --- Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dbcaa80..df92301 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ LIBRARIES = -lcurses \ -lboost_filesystem - +INSTALL_PATH ?= ./install CXX_FLAGS = -std=c++11 -g -O3 -rdynamic -Wall -MMD -MP -fPIC ${INCLUDE_PATH} -Werror -Wno-literal-suffix @@ -146,5 +146,12 @@ bin/% : obj/standalone/%.o ${CXX} ${LINK_EXE_FLAGS} ${UHAL_LIBRARY_FLAGS} ${UHAL_LIBRARIES} -lBUTool_GenericIPBus -lboost_system -lpugixml ${EXE_GENERIC_IPBUS_STANDALONE_OBJECT_FILES} $^ -o $@ +# ------------------- +# Install +# ------------------- +install: all + install -m 775 -d ${INSTALL_PATH}/lib + install -b -m 775 ./lib/* ${INSTALL_PATH}/lib + -include $(LIBRARY_OBJECT_FILES:.o=.d)