tiamak/monero_c
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix darwin cross compilation build

Browse Source
This commit is contained in:
Czarek Nakamoto
2024-04-26 08:15:47 +02:00
parent bc0705e5d9
commit 62d5d5d393
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
monero_libwallet2_api_c/CMakeLists.txt
View File

@@ -287,7 +287,8 @@ include_directories( ${EXTERNAL_LIBS_DIR}/include )
message(STATUS EXTERNAL_LIBS_DIR : ${EXTERNAL_LIBS_DIR}) message(STATUS EXTERNAL_LIBS_DIR : ${EXTERNAL_LIBS_DIR})
if(${HOST_ABI} STREQUAL "x86_64-linux-gnu" OR if(${HOST_ABI} STREQUAL "x86_64-linux-gnu" OR
${HOST_ABI} STREQUAL "x86_64-apple-darwin11") ${HOST_ABI} STREQUAL "x86_64-apple-darwin11" OR
${HOST_ABI} STREQUAL "x86_64-linux-android")
set(EXTRA_LIBS "wallet-crypto") set(EXTRA_LIBS "wallet-crypto")
else() else()
set(EXTRA_LIBS "") set(EXTRA_LIBS "")

26
patches/wownero/0010-build-wownero-seed.patch
View File

@@ -1,4 +1,4 @@
From d1a4fae14cf24b9b6644b840d9bfdf3360ef0ff3 Mon Sep 17 00:00:00 2001 From ffa7b0f65d40e941c05940e70fe278493c48d594 Mon Sep 17 00:00:00 2001
From: Czarek Nakamoto <cyjan@mrcyjanek.net> From: Czarek Nakamoto <cyjan@mrcyjanek.net>
Date: Thu, 25 Apr 2024 10:06:04 +0200 Date: Thu, 25 Apr 2024 10:06:04 +0200
Subject: [PATCH] build wownero-seed Subject: [PATCH] build wownero-seed
@@ -8,9 +8,9 @@ Subject: [PATCH] build wownero-seed
contrib/depends/hosts/darwin.mk | 1 + contrib/depends/hosts/darwin.mk | 1 +
contrib/depends/hosts/mingw32.mk | 3 + contrib/depends/hosts/mingw32.mk | 3 +
contrib/depends/packages/packages.mk | 2 +- contrib/depends/packages/packages.mk | 2 +-
contrib/depends/packages/wownero_seed.mk | 31 ++ contrib/depends/packages/wownero_seed.mk | 35 ++
.../0001-fix-duplicate-symbol-error.patch | 498 ++++++++++++++++++ .../0001-fix-duplicate-symbol-error.patch | 498 ++++++++++++++++++
6 files changed, 536 insertions(+), 2 deletions(-) 6 files changed, 540 insertions(+), 2 deletions(-)
create mode 100644 contrib/depends/packages/wownero_seed.mk create mode 100644 contrib/depends/packages/wownero_seed.mk
create mode 100644 contrib/depends/patches/wownero_seed/0001-fix-duplicate-symbol-error.patch create mode 100644 contrib/depends/patches/wownero_seed/0001-fix-duplicate-symbol-error.patch
@@ -66,10 +66,10 @@ index 8783d4955..3d513c5a2 100644
ifneq ($(GITIAN),1) ifneq ($(GITIAN),1)
diff --git a/contrib/depends/packages/wownero_seed.mk b/contrib/depends/packages/wownero_seed.mk diff --git a/contrib/depends/packages/wownero_seed.mk b/contrib/depends/packages/wownero_seed.mk
new file mode 100644 new file mode 100644
index 000000000..703e34a46 index 000000000..b376f80c5
--- /dev/null --- /dev/null
+++ b/contrib/depends/packages/wownero_seed.mk +++ b/contrib/depends/packages/wownero_seed.mk
@@ -0,0 +1,31 @@ @@ -0,0 +1,35 @@
+package=wownero_seed +package=wownero_seed
+$(package)_version=0.3.0 +$(package)_version=0.3.0
+$(package)_download_path=https://github.com/MrCyjaneK/wownero-seed/archive/ +$(package)_download_path=https://github.com/MrCyjaneK/wownero-seed/archive/
@@ -82,18 +82,22 @@ index 000000000..703e34a46
+ patch -p1 < $($(package)_patch_dir)/0001-fix-duplicate-symbol-error.patch + patch -p1 < $($(package)_patch_dir)/0001-fix-duplicate-symbol-error.patch
+endef +endef
+ +
+define $(package)_darwin_config_cmds
+ CC="$($(package)_cc)" CXX="$($(package)_cxx)" cmake -DCMAKE_RANLIB="$($(package)_ranlib)" -DCMAKE_AR="$($(package)_ar)" -DCMAKE_INSTALL_PREFIX="$(host_prefix)" .
+endef
+ +
+define $(package)_config_cmds +ifeq ($(host_os),darwin)
+ CC="$($(package)_cc)" CXX="$($(package)_cxx)" cmake -DCMAKE_INSTALL_PREFIX="$(host_prefix)" -DCMAKE_POSITION_INDEPENDENT_CODE=ON . + define $(package)_config_cmds
+endef + CC="$($(package)_cc)" CXX="$($(package)_cxx)" cmake -DCMAKE_RANLIB="$($(package)_ranlib)" -DCMAKE_AR="$($(package)_ar)" -DCMAKE_INSTALL_PREFIX="$(host_prefix)" -DCMAKE_POSITION_INDEPENDENT_CODE=ON .
+ endef
+else
+ define $(package)_config_cmds
+ CC="$($(package)_cc)" CXX="$($(package)_cxx)" cmake -DCMAKE_INSTALL_PREFIX="$(host_prefix)" -DCMAKE_POSITION_INDEPENDENT_CODE=ON .
+ endef
+endif
+ +
+define $(package)_set_vars +define $(package)_set_vars
+ $(package)_build_opts=CC="$($(package)_cc)" CXX="$($(package)_cxx)" + $(package)_build_opts=CC="$($(package)_cc)" CXX="$($(package)_cxx)"
+endef +endef
+ +
+
+define $(package)_build_cmds +define $(package)_build_cmds
+ CC="$($(package)_cc)" CXX="$($(package)_cxx)" $(MAKE) VERBOSE=1 + CC="$($(package)_cc)" CXX="$($(package)_cxx)" $(MAKE) VERBOSE=1
+endef +endef