build: Re-enable external signer on Windows

hebasto · hebasto · commit 86cb0b7168a2 · 2022-10-28T14:29:10.000+01:00
diff --git a/ci/test/00_setup_env_win64.sh b/ci/test/00_setup_env_win64.sh
@@ -13,4 +13,4 @@ export DPKG_ADD_ARCH="i386"
 export PACKAGES="python3 nsis g++-mingw-w64-x86-64-posix wine-binfmt wine64 wine32 file"
 export RUN_FUNCTIONAL_TESTS=false
 export GOAL="deploy"
-export BITCOIN_CONFIG="--enable-reduce-exports --disable-external-signer --disable-gui-tests"
+export BITCOIN_CONFIG="--enable-reduce-exports --enable-external-signer --disable-gui-tests"
diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk
@@ -3,6 +3,11 @@ $(package)_version=1.80.0
 $(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$($(package)_version)/source/
 $(package)_file_name=boost_$(subst .,_,$($(package)_version)).tar.bz2
 $(package)_sha256_hash=1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0
+$(package)_patches := mingw32_process.patch
+
+define $(package)_preprocess_cmds
+  patch -p1 -i $($(package)_patch_dir)/mingw32_process.patch
+endef
 
 define $(package)_stage_cmds
   mkdir -p $($(package)_staging_prefix_dir)/include && \
diff --git a/depends/patches/boost/mingw32_process.patch b/depends/patches/boost/mingw32_process.patch
@@ -0,0 +1,21 @@
+Fix compiling for MinGW-w64 using std::filesystem 
+
+Upstream commit:
+ - https://github.com/boostorg/process/commit/a7b65bfc44f4af3a9d584fe9347fde0944c0167a
+
+--- a/boost/process/detail/windows/basic_cmd.hpp
++++ b/boost/process/detail/windows/basic_cmd.hpp
+@@ -159,8 +159,13 @@ struct exe_cmd_init : handler_base_ext
+         return exe_cmd_init<Char>(std::move(sh), std::move(args_));
+     }
+ 
++#ifdef BOOST_PROCESS_USE_STD_FS
++    static std:: string get_shell(char)    {return shell(). string(); }
++    static std::wstring get_shell(wchar_t) {return shell().wstring(); }
++#else
+     static std:: string get_shell(char)    {return shell(). string(codecvt()); }
+     static std::wstring get_shell(wchar_t) {return shell().wstring(codecvt());}
++#endif
+ 
+     static exe_cmd_init<Char> cmd_shell(string_type&& cmd)
+     {
diff --git a/src/test/system_tests.cpp b/src/test/system_tests.cpp
@@ -51,29 +51,39 @@ BOOST_AUTO_TEST_CASE(run_command)
     }
     {
         // An invalid command is handled by Boost
+#ifdef __MINGW64__
+        constexpr int expected_error{6};
+#else
+        constexpr int expected_error{2};
+#endif
         BOOST_CHECK_EXCEPTION(RunCommandParseJSON("invalid_command"), boost::process::process_error, [&](const boost::process::process_error& e) {
             BOOST_CHECK(std::string(e.what()).find("RunCommandParseJSON error:") == std::string::npos);
-            BOOST_CHECK_EQUAL(e.code().value(), 2);
+            BOOST_CHECK_EQUAL(e.code().value(), expected_error);
             return true;
         });
     }
     {
         // Return non-zero exit code, no output to stderr
 #ifdef WIN32
-        const std::string command{"cmd.exe /c call"};
+        const std::string command{"cmd.exe /c exit 1"};
 #else
         const std::string command{"false"};
 #endif
         BOOST_CHECK_EXCEPTION(RunCommandParseJSON(command), std::runtime_error, [&](const std::runtime_error& e) {
-            BOOST_CHECK(std::string(e.what()).find(strprintf("RunCommandParseJSON error: process(%s) returned 1: \n", command)) != std::string::npos);
+            const std::string what(e.what());
+            BOOST_CHECK(what.find(strprintf("RunCommandParseJSON error: process(%s) returned 1: \n", command)) != std::string::npos);
             return true;
         });
     }
     {
         // Return non-zero exit code, with error message for stderr
 #ifdef WIN32
         const std::string command{"cmd.exe /c dir nosuchfile"};
+#ifdef _MSC_VER
         const std::string expected{"File Not Found"};
+#else
+        const std::string expected{"File not found."};
+#endif
 #else
         const std::string command{"ls nosuchfile"};
         const std::string expected{"No such file or directory"};
