wip

2 files changed, 4 insertions, 48 deletions

diff --git a/build_single.sh b/build_single.sh
index a10c89a..f95fa87 100755
--- a/build_single.sh
+++ b/build_single.sh
@@ -34,7 +34,7 @@ fi
 if [[ ! -d "$repo" ]]
 then
     echo "no '$repo' directory found. clone with --recursive or run:"
-    echo "$ git submodule init && git submodule update --force";
+    echo '$ git submodule init && git submodule update --force';
     exit 1
 fi
 
@@ -55,12 +55,12 @@ fi
 cd $(dirname $0)
 WDIR=$PWD
 pushd contrib/depends
-    env PATH="$PATH" make "$NPROC" HOST="$HOST_ABI"
+    echo env PATH="$PATH" make "$NPROC" HOST="$HOST_ABI"
 popd
 # source contrib/depends/_native/_source_me
 source contrib/depends/$HOST_ABI/_source_me
-export PATH="$(PWD)/contrib/depends/$HOST_ABI/native/bin:$PATH"
-exit 13
+export PATH="$(pwd)/contrib/depends/_native/bin/:$(pwd)/contrib/depends/$HOST_ABI/native/bin:$PATH"
+
 buildType=Release
 
 pushd ${repo}_libwallet2_api_c
diff --git a/patches/monero/0013-include-locale-only-when-targeting-WIN32 copy.patch b/patches/monero/0013-include-locale-only-when-targeting-WIN32 copy.patch
deleted file mode 100644
index 453d651..0000000
--- a/patches/monero/0013-include-locale-only-when-targeting-WIN32 copy.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From db52bcebe23b29b35ae538f01e72ed4f7f66f931 Mon Sep 17 00:00:00 2001
-From: Czarek Nakamoto <cyjan@mrcyjanek.net>
-Date: Mon, 18 Nov 2024 10:57:37 -0500
-Subject: [PATCH 13/17] include locale only when targeting WIN32
-
----
- CMakeLists.txt            | 6 +++++-
- src/wallet/api/wallet.cpp | 2 ++
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1eac121db..5938be622 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1089,7 +1089,11 @@ if(NOT Boost_FOUND)
- elseif(Boost_FOUND)
-   message(STATUS "Found Boost Version: ${Boost_VERSION_STRING}")
- 
--  set(BOOST_COMPONENTS filesystem thread date_time chrono serialization program_options locale)
-+  set(BOOST_COMPONENTS filesystem thread date_time chrono serialization program_options)
-+
-+  if(WIN32)
-+    list(APPEND BOOST_COMPONENTS locale)
-+  endif()
- 
-   # Boost System is header-only since 1.69
-   if (Boost_VERSION_STRING VERSION_LESS 1.69.0)
-diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
-index 20ccbfb35..c43803033 100644
---- a/src/wallet/api/wallet.cpp
-+++ b/src/wallet/api/wallet.cpp
-@@ -46,7 +46,9 @@
- #include <sstream>
- #include <unordered_map>
- 
-+#ifdef WIN32
- #include <boost/locale.hpp>
-+#endif
- #include <boost/filesystem.hpp>
- #include "bc-ur/src/bc-ur.hpp"
- #if defined(HIDAPI_DUMMY) && !defined(HAVE_HIDAPI)
--- 
-2.49.0
-