core: logging: Correctly handle Boost log dependency for older versions

Some older versions of Boost have a dependency on boost.system.  Add it
to the dependency list.

Also fix use of PISP_LOGGING_ENABLE in case it is not defined in
external projects.  This has a knock-on effect of breaking builds
because of missing include dependencies, so fix it!

Signed-off-by: Naushir Patuck <[email protected]>

src/libpisp/backend/backend.cpp

@@ -7,6 +7,8 @@
  */
 #include "backend.hpp"
 
+#include <cstring>
+
 #include "common/logging.hpp"
 
 using namespace libpisp;

src/libpisp/backend/backend_prepare.cpp

@@ -7,7 +7,9 @@
  */
 #include "backend.hpp"
 
+#include <algorithm>
 #include <cmath>
+#include <cstring>
 #include <string>
 
 #include "common/logging.hpp"

src/libpisp/backend/tiling/split_stage.cpp

@@ -88,7 +88,7 @@ int SplitStage::PushEndDown(int input_end, Dir dir)
 	return input_interval_.End();
 }
 
-void SplitStage::PushEndUp(int output_end, [[maybe_unused]] Dir dir)
+void SplitStage::PushEndUp([[maybe_unused]] int output_end, [[maybe_unused]] Dir dir)
 {
 	PISP_LOG(debug, "(" << name_ << ") Enter with output_end " << output_end);
 	// Genuinely nothing to do here, but we just like to log the usual trace information for consistency.

src/libpisp/common/logging.hpp

@@ -6,6 +6,14 @@
  */
 #pragma once
 
+#include <cassert>
+
+#ifndef PISP_LOGGING_ENABLE
+#define PISP_LOGGING_ENABLE 0
+#endif
+
+#if PISP_LOGGING_ENABLE
+
 #include <boost/log/trivial.hpp>
 
 #define PISP_LOG(sev, stuff) \
@@ -14,6 +22,12 @@ do { \
 		BOOST_LOG_TRIVIAL(sev) << __FUNCTION__ << ": " << stuff; \
 } while (0)
 
+#else
+
+#define PISP_LOG(sev, stuff) do { } while(0)
+
+#endif
+
 #define PISP_ASSERT(x) assert(x)
 
 namespace libpisp

src/libpisp/frontend/frontend.cpp

@@ -7,6 +7,8 @@
  */
 #include "frontend.hpp"
 
+#include <cstddef>
+
 #include "common/logging.hpp"
 #include "common/utils.hpp"
 

src/meson.build

@@ -13,7 +13,7 @@ pisp_deps = [
     dependency('threads')
 ]
 
-logging_dep = dependency('boost', modules : ['log', 'log_setup', 'thread'], required : get_option('logging'))
+logging_dep = dependency('boost', modules : ['log', 'log_setup', 'thread', 'system'], required : get_option('logging'))
 if logging_dep.found()
     logging_args = ['-DPISP_LOGGING_ENABLE=1', '-DBOOST_BIND_GLOBAL_PLACEHOLDERS', '-DBOOST_LOG_DYN_LINK=1']
     pisp_deps += logging_dep