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

fix build issues with wownero-seed

Browse Source
This commit is contained in:
Czarek Nakamoto
2024-04-25 18:45:38 +02:00
parent 0d041dfbfb
commit 1f2656712b
1 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,18 +1,33 @@
From 28aa4a30dbcc497114f5e3c83d89c363d19b0fa8 Mon Sep 17 00:00:00 2001
From 7dc711da033d48303fb4ef8e5c49b40614726db0 Mon Sep 17 00:00:00 2001
From: Czarek Nakamoto <cyjan@mrcyjanek.net>
Date: Thu, 25 Apr 2024 10:06:04 +0200
Subject: [PATCH] build wownero-seed
---
contrib/depends/hosts/android.mk | 3 +-
contrib/depends/hosts/darwin.mk | 1 +
contrib/depends/hosts/mingw32.mk | 3 +
contrib/depends/packages/packages.mk | 2 +-
contrib/depends/packages/wownero_seed.mk | 27 +
contrib/depends/packages/wownero_seed.mk | 31 ++
.../0001-fix-duplicate-symbol-error.patch | 498 ++++++++++++++++++
5 files changed, 530 insertions(+), 1 deletion(-)
6 files changed, 536 insertions(+), 2 deletions(-)
create mode 100644 contrib/depends/packages/wownero_seed.mk
create mode 100644 contrib/depends/patches/wownero_seed/0001-fix-duplicate-symbol-error.patch
diff --git a/contrib/depends/hosts/android.mk b/contrib/depends/hosts/android.mk
index d6f8b99dd..5b2309972 100644
--- a/contrib/depends/hosts/android.mk
+++ b/contrib/depends/hosts/android.mk
@@ -6,7 +6,8 @@ endif
android_CC=$(host_toolchain)clang
android_CXX=$(host_toolchain)clang++
-android_RANLIB=:
+android_RANLIB=$(host_toolchain)ranlib
+android_AR=$(host_toolchain)ar
android_CFLAGS=-pipe
android_CXXFLAGS=$(android_CFLAGS)
diff --git a/contrib/depends/hosts/darwin.mk b/contrib/depends/hosts/darwin.mk
index cbe795081..ce2f5669d 100644
--- a/contrib/depends/hosts/darwin.mk
@@ -51,10 +66,10 @@ index 8783d4955..3d513c5a2 100644
ifneq ($(GITIAN),1)
diff --git a/contrib/depends/packages/wownero_seed.mk b/contrib/depends/packages/wownero_seed.mk
new file mode 100644
index 000000000..881685444
index 000000000..cc6f09e68
--- /dev/null
+++ b/contrib/depends/packages/wownero_seed.mk
@@ -0,0 +1,27 @@
@@ -0,0 +1,31 @@
+package=wownero_seed
+$(package)_version=0.3.0
+$(package)_download_path=https://github.com/MrCyjaneK/wownero-seed/archive/
@@ -67,10 +82,14 @@ index 000000000..881685444
+ patch -p1 < $($(package)_patch_dir)/0001-fix-duplicate-symbol-error.patch
+endef
+
+define $(package)_config_cmds
+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
+ CC="$($(package)_cc)" CXX="$($(package)_cxx)" cmake -DCMAKE_INSTALL_PREFIX="$(host_prefix)" .
+endef
+
+define $(package)_set_vars
+ $(package)_build_opts=CC="$($(package)_cc)" CXX="$($(package)_cxx)"
+endef
@@ -587,5 +606,5 @@ index 000000000..1969f3f23
+2.39.2
+
--
2.39.2
2.25.1