From c8ad2e6638b199312a11d2ceb8ae00356a4ed8ec Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Fri, 1 Nov 2024 17:30:05 +0100 Subject: update boost filenames --- monero_libwallet2_api_c/CMakeLists.txt | 7 ++++--- patches/monero/0020-boost-fix-filenames.patch | 25 +++++++++++++++++++++++++ patches/wownero/0016-boost-fix-filenames.patch | 25 +++++++++++++++++++++++++ patches/zano/0003-boost-fix-filenames.patch | 25 +++++++++++++++++++++++++ 4 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 patches/monero/0020-boost-fix-filenames.patch create mode 100644 patches/wownero/0016-boost-fix-filenames.patch create mode 100644 patches/zano/0003-boost-fix-filenames.patch diff --git a/monero_libwallet2_api_c/CMakeLists.txt b/monero_libwallet2_api_c/CMakeLists.txt index 10c0db9..c2e1f31 100644 --- a/monero_libwallet2_api_c/CMakeLists.txt +++ b/monero_libwallet2_api_c/CMakeLists.txt @@ -76,8 +76,8 @@ if(${HOST_ABI} STREQUAL "x86_64-linux-android" OR ${HOST_ABI} STREQUAL "aarch64- set(BOOST_WTF_DATE_TIME "${BOOST_WTF}") set(BOOST_WTF_PART "") elseif(${HOST_ABI} STREQUAL "aarch64-linux-gnu") - set(BOOST_WTF "-mt-a64") - set(BOOST_WTF_DATE_TIME "-mt-s-a64") + set(BOOST_WTF "-mt") + set(BOOST_WTF_DATE_TIME "${BOOST_WTF}") set(BOOST_WTF_PART "") elseif(${HOST_ABI} STREQUAL "x86_64-w64-mingw32" OR ${HOST_ABI} STREQUAL "i686-w64-mingw32") set(BOOST_WTF "-mt-s") @@ -456,6 +456,7 @@ endif() if (${MONERO_FLAVOR} STREQUAL "zano") set(API_IMPORTS wallet + crypto common lmdb unbound @@ -486,6 +487,7 @@ else() ringct ringct_basic net + crypto common cncrypto blockchain_db @@ -533,7 +535,6 @@ target_link_libraries( wallet2_api_c ${BCUR_ENABLED} - crypto sodium diff --git a/patches/monero/0020-boost-fix-filenames.patch b/patches/monero/0020-boost-fix-filenames.patch new file mode 100644 index 0000000..3e9bf18 --- /dev/null +++ b/patches/monero/0020-boost-fix-filenames.patch @@ -0,0 +1,25 @@ +From 4d90fcf690ded54256f89fa3c91292ef1f27da70 Mon Sep 17 00:00:00 2001 +From: Czarek Nakamoto +Date: Fri, 1 Nov 2024 17:28:43 +0100 +Subject: [PATCH] boost fix filenames + +--- + contrib/depends/packages/boost.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/contrib/depends/packages/boost.mk b/contrib/depends/packages/boost.mk +index c17e863..ed577c5 100644 +--- a/contrib/depends/packages/boost.mk ++++ b/contrib/depends/packages/boost.mk +@@ -9,7 +9,7 @@ $(package)_patches=fix_aroptions.patch fix_arm_arch.patch + define $(package)_set_vars + $(package)_config_opts_release=variant=release + $(package)_config_opts_debug=variant=debug +-$(package)_config_opts=--layout=tagged --build-type=complete --user-config=user-config.jam ++$(package)_config_opts=--layout=system --user-config=user-config.jam + $(package)_config_opts+=threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1 + $(package)_config_opts_linux=threadapi=pthread runtime-link=shared + $(package)_config_opts_android=threadapi=pthread runtime-link=static target-os=android +-- +2.39.5 (Apple Git-154) + diff --git a/patches/wownero/0016-boost-fix-filenames.patch b/patches/wownero/0016-boost-fix-filenames.patch new file mode 100644 index 0000000..a20ac04 --- /dev/null +++ b/patches/wownero/0016-boost-fix-filenames.patch @@ -0,0 +1,25 @@ +From daaf2ec5a00b31fb085f3bca4dba95b7b2fe704d Mon Sep 17 00:00:00 2001 +From: Czarek Nakamoto +Date: Fri, 1 Nov 2024 17:29:09 +0100 +Subject: [PATCH] boost fix filenames + +--- + contrib/depends/packages/boost.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/contrib/depends/packages/boost.mk b/contrib/depends/packages/boost.mk +index c17e863cc..ed577c502 100644 +--- a/contrib/depends/packages/boost.mk ++++ b/contrib/depends/packages/boost.mk +@@ -9,7 +9,7 @@ $(package)_patches=fix_aroptions.patch fix_arm_arch.patch + define $(package)_set_vars + $(package)_config_opts_release=variant=release + $(package)_config_opts_debug=variant=debug +-$(package)_config_opts=--layout=tagged --build-type=complete --user-config=user-config.jam ++$(package)_config_opts=--layout=system --user-config=user-config.jam + $(package)_config_opts+=threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1 + $(package)_config_opts_linux=threadapi=pthread runtime-link=shared + $(package)_config_opts_android=threadapi=pthread runtime-link=static target-os=android +-- +2.39.5 (Apple Git-154) + diff --git a/patches/zano/0003-boost-fix-filenames.patch b/patches/zano/0003-boost-fix-filenames.patch new file mode 100644 index 0000000..6506068 --- /dev/null +++ b/patches/zano/0003-boost-fix-filenames.patch @@ -0,0 +1,25 @@ +From 865ffb66cbaeff20115b812f1380bb15c9844129 Mon Sep 17 00:00:00 2001 +From: Czarek Nakamoto +Date: Fri, 1 Nov 2024 17:29:35 +0100 +Subject: [PATCH] boost fix filenames + +--- + contrib/depends/packages/boost.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/contrib/depends/packages/boost.mk b/contrib/depends/packages/boost.mk +index ff725680..be382d3a 100644 +--- a/contrib/depends/packages/boost.mk ++++ b/contrib/depends/packages/boost.mk +@@ -9,7 +9,7 @@ $(package)_patches=fix_aroptions.patch fix_arm_arch.patch fix_pthread_win.patch + define $(package)_set_vars + $(package)_config_opts_release=variant=release + $(package)_config_opts_debug=variant=debug +-$(package)_config_opts=--layout=tagged --build-type=complete --user-config=user-config.jam ++$(package)_config_opts=--layout=system --user-config=user-config.jam + $(package)_config_opts+=threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1 + $(package)_config_opts_linux=threadapi=pthread runtime-link=static + $(package)_config_opts_android=threadapi=pthread runtime-link=static target-os=android +-- +2.39.5 (Apple Git-154) + -- cgit v1.2.3