fix wownero build issues, rename target to proper triplet

2 files changed, 188 insertions, 0 deletions

diff --git a/patches/monero/0013-rename-arm-armv7a.patch b/patches/monero/0013-rename-arm-armv7a.patch
new file mode 100644
index 0000000..7049065
--- /dev/null
+++ b/patches/monero/0013-rename-arm-armv7a.patch
@@ -0,0 +1,94 @@
+From 9b7623e565a31db296f20cac00ddde58e8e83fe2 Mon Sep 17 00:00:00 2001
+From: Czarek Nakamoto <cyjan@mrcyjanek.net>
+Date: Wed, 12 Jun 2024 15:48:01 +0200
+Subject: [PATCH] rename arm -> armv7a
+
+---
+ contrib/depends/hosts/android.mk        | 2 +-
+ contrib/depends/packages/android_ndk.mk | 6 +++++-
+ contrib/depends/packages/openssl.mk     | 2 +-
+ contrib/depends/toolchain.cmake.in      | 8 ++++----
+ 4 files changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/contrib/depends/hosts/android.mk b/contrib/depends/hosts/android.mk
+index e1c99aef3..827103c36 100644
+--- a/contrib/depends/hosts/android.mk
++++ b/contrib/depends/hosts/android.mk
+@@ -1,6 +1,6 @@
+ ANDROID_API=21
+ host_toolchain=nonexistent
+-ifeq ($(host_arch),arm)
++ifeq ($(host_arch),armv7a)
+ host_toolchain=armv7a-linux-androideabi${ANDROID_API}-
+ endif
+ ifeq ($(host_arch),x86_64)
+diff --git a/contrib/depends/packages/android_ndk.mk b/contrib/depends/packages/android_ndk.mk
+index 1ad250653..2c2914ec2 100644
+--- a/contrib/depends/packages/android_ndk.mk
++++ b/contrib/depends/packages/android_ndk.mk
+@@ -7,7 +7,7 @@ $(package)_sha256_hash=eefeafe7ccf177de7cc57158da585e7af119bb7504a63604ad719e4b2
+ $(package)_version_apiversion=21
+ 
+ define $(package)_set_vars
+-$(package)_config_opts_arm=--arch arm
++$(package)_config_opts_armv7a=--arch arm
+ $(package)_config_opts_aarch64=--arch arm64
+ $(package)_config_opts_x86_64=--arch x86_64
+ $(package)_config_opts_i686=--arch x86
+@@ -18,6 +18,8 @@ define $(package)_extract_cmds
+   unzip -q $($(1)_source_dir)/$($(package)_file_name)
+ endef
+ 
++# arm-linux-androideabi-ar - openssl workaround
++
+ define $(package)_stage_cmds
+   mkdir -p $(build_prefix) &&\
+   echo $(build_prefix)/toolchain && \
+@@ -25,7 +27,9 @@ define $(package)_stage_cmds
+     --install-dir $(build_prefix)/toolchain --stl=libc++ $($(package)_config_opts) &&\
+   mv $(build_prefix)/toolchain $($(package)_staging_dir)/$(host_prefix)/native && \
+   cp $($(package)_staging_dir)/$(host_prefix)/native/bin/llvm-ar $($(package)_staging_dir)/$(host_prefix)/native/bin/$(host)$($(package)_version_apiversion)-ar &&\
++  cp $($(package)_staging_dir)/$(host_prefix)/native/bin/llvm-ar $($(package)_staging_dir)/$(host_prefix)/native/bin/arm-linux-androideabi-ar &&\
+   cp $($(package)_staging_dir)/$(host_prefix)/native/bin/llvm-ranlib $($(package)_staging_dir)/$(host_prefix)/native/bin/$(host)$($(package)_version_apiversion)-ranlib &&\
++  cp $($(package)_staging_dir)/$(host_prefix)/native/bin/llvm-ranlib $($(package)_staging_dir)/$(host_prefix)/native/bin/arm-linux-androideabi-ranlib &&\
+   cp $($(package)_staging_dir)/$(host_prefix)/native/bin/llvm-ar $($(package)_staging_dir)/$(host_prefix)/native/bin/$(host)-ar &&\
+   cp $($(package)_staging_dir)/$(host_prefix)/native/bin/llvm-ranlib $($(package)_staging_dir)/$(host_prefix)/native/bin/$(host)-ranlib
+ endef
+diff --git a/contrib/depends/packages/openssl.mk b/contrib/depends/packages/openssl.mk
+index a157762c7..2430f6495 100644
+--- a/contrib/depends/packages/openssl.mk
++++ b/contrib/depends/packages/openssl.mk
+@@ -34,7 +34,7 @@ $(package)_config_opts_x86_64_linux=linux-x86_64
+ $(package)_config_opts_i686_linux=linux-generic32
+ $(package)_config_opts_arm_linux=linux-generic32
+ $(package)_config_opts_aarch64_linux=linux-generic64
+-$(package)_config_opts_arm_android=--static android-arm
++$(package)_config_opts_armv7a_android=--static android-arm
+ $(package)_config_opts_aarch64_android=--static android-arm64
+ $(package)_config_opts_aarch64_darwin=darwin64-arm64-cc
+ $(package)_config_opts_riscv64_linux=linux-generic64
+diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in
+index 96a95ceb8..48a6f947e 100644
+--- a/contrib/depends/toolchain.cmake.in
++++ b/contrib/depends/toolchain.cmake.in
+@@ -100,13 +100,13 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+   SET(LLVM_ENABLE_PIE OFF)
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
+   SET(ANDROID TRUE)
+-  if(ARCHITECTURE STREQUAL "arm")
++  if(ARCHITECTURE STREQUAL "armv7a")
+     SET(CMAKE_ANDROID_ARCH_ABI "armeabi-v7a")
+     SET(CMAKE_SYSTEM_PROCESSOR "armv7-a")
+     SET(CMAKE_ANDROID_ARM_MODE ON)
+-    SET(CMAKE_C_COMPILER_TARGET arm-linux-androideabi21)
+-    SET(CMAKE_CXX_COMPILER_TARGET arm-linux-androideabi21)
+-    SET(_CMAKE_TOOLCHAIN_PREFIX arm-linux-androideabi21-)
++    SET(CMAKE_C_COMPILER_TARGET armv7a-linux-androideabi21)
++    SET(CMAKE_CXX_COMPILER_TARGET armv7a-linux-androideabi21)
++    SET(_CMAKE_TOOLCHAIN_PREFIX armv7a-linux-androideabi21-)
+   elseif(ARCHITECTURE STREQUAL "aarch64")
+     SET(CMAKE_ANDROID_ARCH_ABI "arm64-v8a")
+     SET(CMAKE_SYSTEM_PROCESSOR "aarch64")
+-- 
+2.39.2
+
diff --git a/patches/wownero/0012-rename-arm-armv7a.patch b/patches/wownero/0012-rename-arm-armv7a.patch
new file mode 100644
index 0000000..6ba41ea
--- /dev/null
+++ b/patches/wownero/0012-rename-arm-armv7a.patch
@@ -0,0 +1,94 @@
+From 6b931c1af6965b3da03b795e711b87eaaec17838 Mon Sep 17 00:00:00 2001
+From: Czarek Nakamoto <cyjan@mrcyjanek.net>
+Date: Wed, 12 Jun 2024 15:48:01 +0200
+Subject: [PATCH] rename arm -> armv7a
+
+---
+ contrib/depends/hosts/android.mk        | 2 +-
+ contrib/depends/packages/android_ndk.mk | 6 +++++-
+ contrib/depends/packages/openssl.mk     | 2 +-
+ contrib/depends/toolchain.cmake.in      | 8 ++++----
+ 4 files changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/contrib/depends/hosts/android.mk b/contrib/depends/hosts/android.mk
+index c7b6b6d36..9477b4e22 100644
+--- a/contrib/depends/hosts/android.mk
++++ b/contrib/depends/hosts/android.mk
+@@ -1,6 +1,6 @@
+ ANDROID_API=21
+ host_toolchain=nonexistent
+-ifeq ($(host_arch),arm)
++ifeq ($(host_arch),armv7a)
+ host_toolchain=armv7a-linux-androideabi${ANDROID_API}-
+ endif
+ ifeq ($(host_arch),x86_64)
+diff --git a/contrib/depends/packages/android_ndk.mk b/contrib/depends/packages/android_ndk.mk
+index 1ad250653..2c2914ec2 100644
+--- a/contrib/depends/packages/android_ndk.mk
++++ b/contrib/depends/packages/android_ndk.mk
+@@ -7,7 +7,7 @@ $(package)_sha256_hash=eefeafe7ccf177de7cc57158da585e7af119bb7504a63604ad719e4b2
+ $(package)_version_apiversion=21
+ 
+ define $(package)_set_vars
+-$(package)_config_opts_arm=--arch arm
++$(package)_config_opts_armv7a=--arch arm
+ $(package)_config_opts_aarch64=--arch arm64
+ $(package)_config_opts_x86_64=--arch x86_64
+ $(package)_config_opts_i686=--arch x86
+@@ -18,6 +18,8 @@ define $(package)_extract_cmds
+   unzip -q $($(1)_source_dir)/$($(package)_file_name)
+ endef
+ 
++# arm-linux-androideabi-ar - openssl workaround
++
+ define $(package)_stage_cmds
+   mkdir -p $(build_prefix) &&\
+   echo $(build_prefix)/toolchain && \
+@@ -25,7 +27,9 @@ define $(package)_stage_cmds
+     --install-dir $(build_prefix)/toolchain --stl=libc++ $($(package)_config_opts) &&\
+   mv $(build_prefix)/toolchain $($(package)_staging_dir)/$(host_prefix)/native && \
+   cp $($(package)_staging_dir)/$(host_prefix)/native/bin/llvm-ar $($(package)_staging_dir)/$(host_prefix)/native/bin/$(host)$($(package)_version_apiversion)-ar &&\
++  cp $($(package)_staging_dir)/$(host_prefix)/native/bin/llvm-ar $($(package)_staging_dir)/$(host_prefix)/native/bin/arm-linux-androideabi-ar &&\
+   cp $($(package)_staging_dir)/$(host_prefix)/native/bin/llvm-ranlib $($(package)_staging_dir)/$(host_prefix)/native/bin/$(host)$($(package)_version_apiversion)-ranlib &&\
++  cp $($(package)_staging_dir)/$(host_prefix)/native/bin/llvm-ranlib $($(package)_staging_dir)/$(host_prefix)/native/bin/arm-linux-androideabi-ranlib &&\
+   cp $($(package)_staging_dir)/$(host_prefix)/native/bin/llvm-ar $($(package)_staging_dir)/$(host_prefix)/native/bin/$(host)-ar &&\
+   cp $($(package)_staging_dir)/$(host_prefix)/native/bin/llvm-ranlib $($(package)_staging_dir)/$(host_prefix)/native/bin/$(host)-ranlib
+ endef
+diff --git a/contrib/depends/packages/openssl.mk b/contrib/depends/packages/openssl.mk
+index a157762c7..2430f6495 100644
+--- a/contrib/depends/packages/openssl.mk
++++ b/contrib/depends/packages/openssl.mk
+@@ -34,7 +34,7 @@ $(package)_config_opts_x86_64_linux=linux-x86_64
+ $(package)_config_opts_i686_linux=linux-generic32
+ $(package)_config_opts_arm_linux=linux-generic32
+ $(package)_config_opts_aarch64_linux=linux-generic64
+-$(package)_config_opts_arm_android=--static android-arm
++$(package)_config_opts_armv7a_android=--static android-arm
+ $(package)_config_opts_aarch64_android=--static android-arm64
+ $(package)_config_opts_aarch64_darwin=darwin64-arm64-cc
+ $(package)_config_opts_riscv64_linux=linux-generic64
+diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in
+index 249213b20..cc1d9b5c5 100644
+--- a/contrib/depends/toolchain.cmake.in
++++ b/contrib/depends/toolchain.cmake.in
+@@ -100,13 +100,13 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+   SET(LLVM_ENABLE_PIE OFF)
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
+   SET(ANDROID TRUE)
+-  if(ARCHITECTURE STREQUAL "arm")
++  if(ARCHITECTURE STREQUAL "armv7a")
+     SET(CMAKE_ANDROID_ARCH_ABI "armeabi-v7a")
+     SET(CMAKE_SYSTEM_PROCESSOR "armv7-a")
+     SET(CMAKE_ANDROID_ARM_MODE ON)
+-    SET(CMAKE_C_COMPILER_TARGET arm-linux-androideabi21)
+-    SET(CMAKE_CXX_COMPILER_TARGET arm-linux-androideabi21)
+-    SET(_CMAKE_TOOLCHAIN_PREFIX arm-linux-androideabi21-)
++    SET(CMAKE_C_COMPILER_TARGET armv7a-linux-androideabi21)
++    SET(CMAKE_CXX_COMPILER_TARGET armv7a-linux-androideabi21)
++    SET(_CMAKE_TOOLCHAIN_PREFIX armv7a-linux-androideabi21-)
+   elseif(ARCHITECTURE STREQUAL "aarch64")
+     SET(CMAKE_ANDROID_ARCH_ABI "arm64-v8a")
+     SET(CMAKE_SYSTEM_PROCESSOR "aarch64")
+-- 
+2.39.2
+