Ensure GIL is released solely for build phase to fix errors from new pybind version

Author: loonycyborg

src/python_interface/python_interface.cpp

@@ -30,6 +30,7 @@
 #include "python_interface/python_interface.hpp"
 #include "fs_node.hpp"
 #include "scan_cpp.hpp"
+#include "taskmaster.hpp"
 
 #include "python_interface/python_interface_internal.hpp"
 #include "python_interface/sconscript.hpp"
@@ -253,13 +254,12 @@ PYBIND11_EMBEDDED_MODULE(SCons, m_scons)
 
 		PyDict_Update(main_namespace().ptr(), m_script.attr("__dict__").ptr());
 
-		static py::gil_scoped_release unlock{};
+		sconspp::pre_build_hook = []() -> void* { return new py::gil_scoped_release; };
+		sconspp::post_build_hook = [](void* release) { delete reinterpret_cast<py::gil_scoped_release*>(release); };
 	}
 
 	void run_script(const std::string& filename, std::vector<std::string> command_line_target_strings)
 	{
-		py::gil_scoped_acquire lock{};
-
 		try {
 			main_namespace()["COMMAND_LINE_TARGETS"] = py::cast(command_line_target_strings);
 

src/taskmaster.cpp

@@ -129,6 +129,9 @@ namespace sconspp
 	bool always_build;
 	bool keep_going;
 
+	std::function<void*()> pre_build_hook;
+	std::function<void(void*)> post_build_hook;
+
 	void build_order(Node end_goal, BuildOrder& output)
 	{
 		std::map<Node, boost::default_color_type> colors;
@@ -278,10 +281,13 @@ namespace sconspp
 
 	int build(Node end_goal)
 	{
+		void* hook_data = pre_build_hook ? pre_build_hook() : nullptr;
 		BuildOrder nodes;
 		build_order(end_goal, nodes);
 		PersistentData& db = get_global_db();
 
-		return parallel_build(nodes, db);
+		int result = parallel_build(nodes, db);
+		if(post_build_hook) post_build_hook(hook_data);
+		return result;
 	}
 }

src/taskmaster.hpp

@@ -31,6 +31,9 @@ namespace sconspp
 	extern bool always_build;
 	extern bool keep_going;
 
+	extern std::function<void*()> pre_build_hook;
+	extern std::function<void(void*)> post_build_hook;
+
 	int build(Node end_goal);
 
 	void build_order(Node end_goal, std::vector<Node>& nodes);