d7a38301ec
* updated monero dependency * update patches for v0.18.3.4 * update generate checksum to include version of submodule as well
138 lines
5.0 KiB
Diff
138 lines
5.0 KiB
Diff
From 0f1d5e1296dc1e8c9ee323fa7bdf706ff76df2a7 Mon Sep 17 00:00:00 2001
|
|
From: Czarek Nakamoto <cyjan@mrcyjanek.net>
|
|
Date: Tue, 12 Mar 2024 17:59:13 +0100
|
|
Subject: [PATCH 05/16] fix build issues
|
|
|
|
---
|
|
contrib/depends/hosts/linux.mk | 8 +++----
|
|
contrib/depends/packages/android_ndk.mk | 2 ++
|
|
contrib/depends/packages/packages.mk | 2 +-
|
|
contrib/depends/packages/polyseed.mk | 23 +++++++++++++++++++
|
|
contrib/depends/packages/sodium.mk | 2 +-
|
|
.../patches/polyseed/force-static-mingw.patch | 23 +++++++++++++++++++
|
|
6 files changed, 54 insertions(+), 6 deletions(-)
|
|
create mode 100644 contrib/depends/packages/polyseed.mk
|
|
create mode 100644 contrib/depends/patches/polyseed/force-static-mingw.patch
|
|
|
|
diff --git a/contrib/depends/hosts/linux.mk b/contrib/depends/hosts/linux.mk
|
|
index 912fdb03c..b79799f30 100644
|
|
--- a/contrib/depends/hosts/linux.mk
|
|
+++ b/contrib/depends/hosts/linux.mk
|
|
@@ -11,15 +11,15 @@ linux_debug_CXXFLAGS=$(linux_debug_CFLAGS)
|
|
linux_debug_CPPFLAGS=-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC
|
|
|
|
ifeq (86,$(findstring 86,$(build_arch)))
|
|
-i686_linux_CC=gcc -m32
|
|
-i686_linux_CXX=g++ -m32
|
|
+i686_linux_CC=i686-linux-gnu-gcc
|
|
+i686_linux_CXX=i686-linux-gnu-g++
|
|
i686_linux_AR=ar
|
|
i686_linux_RANLIB=ranlib
|
|
i686_linux_NM=nm
|
|
i686_linux_STRIP=strip
|
|
|
|
-x86_64_linux_CC=gcc -m64
|
|
-x86_64_linux_CXX=g++ -m64
|
|
+x86_64_linux_CC=x86_64-linux-gnu-gcc
|
|
+x86_64_linux_CXX=x86_64-linux-gnu-g++
|
|
x86_64_linux_AR=ar
|
|
x86_64_linux_RANLIB=ranlib
|
|
x86_64_linux_NM=nm
|
|
diff --git a/contrib/depends/packages/android_ndk.mk b/contrib/depends/packages/android_ndk.mk
|
|
index 9b8a5332f..5deff76c7 100644
|
|
--- a/contrib/depends/packages/android_ndk.mk
|
|
+++ b/contrib/depends/packages/android_ndk.mk
|
|
@@ -7,6 +7,8 @@ $(package)_sha256_hash=5dfbbdc2d3ba859fed90d0e978af87c71a91a5be1f6e1c40ba697503d
|
|
define $(package)_set_vars
|
|
$(package)_config_opts_arm=--arch arm
|
|
$(package)_config_opts_aarch64=--arch arm64
|
|
+$(package)_config_opts_x86_64=--arch x86_64
|
|
+$(package)_config_opts_i686=--arch x86
|
|
endef
|
|
|
|
define $(package)_extract_cmds
|
|
diff --git a/contrib/depends/packages/packages.mk b/contrib/depends/packages/packages.mk
|
|
index d2d1eca85..8783d4955 100644
|
|
--- a/contrib/depends/packages/packages.mk
|
|
+++ b/contrib/depends/packages/packages.mk
|
|
@@ -1,4 +1,4 @@
|
|
-packages:=boost openssl zeromq libiconv expat unbound
|
|
+packages:=boost openssl zeromq libiconv expat unbound polyseed
|
|
|
|
# ccache is useless in gitian builds
|
|
ifneq ($(GITIAN),1)
|
|
diff --git a/contrib/depends/packages/polyseed.mk b/contrib/depends/packages/polyseed.mk
|
|
new file mode 100644
|
|
index 000000000..2ddeac621
|
|
--- /dev/null
|
|
+++ b/contrib/depends/packages/polyseed.mk
|
|
@@ -0,0 +1,23 @@
|
|
+package=polyseed
|
|
+$(package)_version=2.0.0
|
|
+$(package)_download_path=https://github.com/tevador/$(package)/archive/refs/tags/
|
|
+$(package)_download_file=v$($(package)_version).tar.gz
|
|
+$(package)_file_name=$(package)-$($(package)_version).tar.gz
|
|
+$(package)_sha256_hash=f36282fcbcd68d32461b8230c89e1a40661bd46b91109681cec637433004135a
|
|
+$(package)_patches=force-static-mingw.patch
|
|
+
|
|
+define $(package)_preprocess_cmds
|
|
+ patch -p1 < $($(package)_patch_dir)/force-static-mingw.patch
|
|
+endef
|
|
+
|
|
+define $(package)_config_cmds
|
|
+ cmake -DCMAKE_INSTALL_PREFIX=$(host_prefix) -DCMAKE_C_COMPILER=$($(package)_cc) .
|
|
+endef
|
|
+
|
|
+define $(package)_build_cmds
|
|
+ $(MAKE)
|
|
+endef
|
|
+
|
|
+define $(package)_stage_cmds
|
|
+ $(MAKE) DESTDIR=$($(package)_staging_dir) install
|
|
+endef
|
|
diff --git a/contrib/depends/packages/sodium.mk b/contrib/depends/packages/sodium.mk
|
|
index 87b34599e..68a5b48ba 100644
|
|
--- a/contrib/depends/packages/sodium.mk
|
|
+++ b/contrib/depends/packages/sodium.mk
|
|
@@ -6,7 +6,7 @@ $(package)_sha256_hash=6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e
|
|
$(package)_patches=disable-glibc-getrandom-getentropy.patch fix-whitespace.patch
|
|
|
|
define $(package)_set_vars
|
|
-$(package)_config_opts=--enable-static --disable-shared
|
|
+$(package)_config_opts=--enable-static --disable-shared --with-pic
|
|
$(package)_config_opts+=--prefix=$(host_prefix)
|
|
endef
|
|
|
|
diff --git a/contrib/depends/patches/polyseed/force-static-mingw.patch b/contrib/depends/patches/polyseed/force-static-mingw.patch
|
|
new file mode 100644
|
|
index 000000000..f05cb2b6a
|
|
--- /dev/null
|
|
+++ b/contrib/depends/patches/polyseed/force-static-mingw.patch
|
|
@@ -0,0 +1,23 @@
|
|
+--- a/include/polyseed.h
|
|
++++ b/include/polyseed.h
|
|
+@@ -93,13 +93,13 @@ Shared/static library definitions
|
|
+ - define POLYSEED_STATIC when linking to the static library
|
|
+ */
|
|
+ #if defined(_WIN32) || defined(__CYGWIN__)
|
|
+- #ifdef POLYSEED_SHARED
|
|
+- #define POLYSEED_API __declspec(dllexport)
|
|
+- #elif !defined(POLYSEED_STATIC)
|
|
+- #define POLYSEED_API __declspec(dllimport)
|
|
+- #else
|
|
+- #define POLYSEED_API
|
|
+- #endif
|
|
++// #ifdef POLYSEED_SHARED
|
|
++// #define POLYSEED_API __declspec(dllexport)
|
|
++// #elif !defined(POLYSEED_STATIC)
|
|
++// #define POLYSEED_API __declspec(dllimport)
|
|
++// #else
|
|
++ #define POLYSEED_API
|
|
++// #endif
|
|
+ #define POLYSEED_PRIVATE
|
|
+ #else
|
|
+ #ifdef POLYSEED_SHARED
|
|
--
|
|
2.39.2
|
|
|