Add in libsodium to bls-dash extract 7

wagerr-builder · Apr 5, 2024 · 84c6eb8 · 84c6eb8
1 parent 91eaa00
commit 84c6eb8
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/depends/packages/bls-dash.mk b/depends/packages/bls-dash.mk
@@ -24,6 +24,8 @@ $(package)_libsodium_sha256_hash=13b8939f75bebd6ff0fac49548fbe1a4c2ac477444b2d68
 $(package)_extra_sources = $($(package)_relic_file_name)
 $(package)_extra_sources += $($(package)_libsodium_file_name)
 
+$(package)_patches = libsodium-bls.patch
+
 define $(package)_fetch_cmds
 $(call fetch_file,$(package),$($(package)_download_path),$($(package)_download_file),$($(package)_file_name),$($(package)_sha256_hash)) && \
 $(call fetch_file,$(package),$($(package)_relic_download_path),$($(package)_relic_download_file),$($(package)_relic_file_name),$($(package)_relic_sha256_hash)) && \
@@ -66,6 +68,7 @@ define $(package)_set_vars
 endef
 
 define $(package)_preprocess_cmds
+  patch -p1 -i $($(package)_patch_dir)/libsodium-bls.patch && \
   sed -i.old "s|GIT_REPOSITORY https://github.com/Chia-Network/relic.git|URL \"../../relic-$($(package)_relic_version).tar.gz\"|" CMakeLists.txt && \
   sed -i.old "s|RELIC_GIT_TAG \".*\"|RELIC_GIT_TAG \"\"|" CMakeLists.txt
 endef

diff --git a/depends/patches/bls-dash/libsodium-bls.patch b/depends/patches/bls-dash/libsodium-bls.patch
@@ -0,0 +1,26 @@
+--- bls-signatures-1.2.0/CMakeLists.txt.old	2024-04-05 07:25:56.663863766 +0100
++++ bls-signatures-1.2.0/CMakeLists.txt	2024-04-05 10:34:07.545680645 +0100
+@@ -30,16 +30,16 @@
+
+ include(FetchContent)
+
+-FetchContent_Declare(Sodium
+-  GIT_REPOSITORY https://github.com/AmineKhaldi/libsodium-cmake.git
+-  # Latest commit at the moment this was added here
+-  # Anchored to libsodium v1.0.18
+-  GIT_TAG f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65
+-)
++#FetchContent_Declare(Sodium
++#  GIT_REPOSITORY https://140.82.121.4/robinlinden/libsodium-cmake.git
++#  # Latest commit at the moment this was added here
++#  # Anchored to libsodium v1.0.18
++#  GIT_TAG f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65
++#)
+ set(SODIUM_PCH "on" CACHE STRING "")
+ set(SODIUM_DISABLE_TESTS "on" CACHE STRING "")
+ set(SODIUM_CHIA_MINIMAL "on" CACHE STRING "")
+-FetchContent_MakeAvailable(Sodium)
++#FetchContent_MakeAvailable(Sodium)
+
+ if (DEFINED ENV{RELIC_MAIN})
+   set(RELIC_GIT_TAG "origin/main")