Patch for bls-dash, fix MacOS SDK path

wagerr-builder · Apr 5, 2024 · b1d7432 · b1d7432
1 parent 5fb2256
commit b1d7432
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build
@@ -128,7 +128,7 @@ fi
 for host in $HOSTS; do
     case "$host" in
         *darwin*)
-            OSX_SDK="$(make -C "${PWD}/depends" --no-print-directory HOST="$host" print-OSX_SDK | sed 's@^[^=]\+=@@g')"
+            OSX_SDK="$(make -C "${PWD}/depends" --no-print-directory HOST="$host" print-OSX_SDK | sed 's@^[^=]\+=@@g' | sed 's/^[[:space:]]*//g')"
             if [ -e "$OSX_SDK" ]; then
                 echo "Found macOS SDK at '${OSX_SDK}', using..."
                 break

diff --git a/depends/packages/bls-dash.mk b/depends/packages/bls-dash.mk
@@ -16,6 +16,8 @@ $(package)_relic_sha256_hash=f2de6ebdc9def7077f56c83c8b06f4da5bacc36b709514bd550
 
 $(package)_extra_sources=$($(package)_relic_file_name)
 
+$(package)_patches=libsodium-cmake.git.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))
@@ -55,6 +57,7 @@ define $(package)_set_vars
 endef
 
 define $(package)_preprocess_cmds
+  patch -p1 < $($(package)_patch_dir)/libsodium-cmake.git.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-git.patch b/depends/patches/bls-dash/libsodium-git.patch
@@ -0,0 +1,11 @@
+--- 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 07:26:36.768015126 +0100
+@@ -31,7 +31,7 @@
+ include(FetchContent)
+
+ FetchContent_Declare(Sodium
+-  GIT_REPOSITORY https://github.com/AmineKhaldi/libsodium-cmake.git
++  GIT_REPOSITORY https://github.com/robinlinden/libsodium-cmake.git
+   # Latest commit at the moment this was added here
+   # Anchored to libsodium v1.0.18
+   GIT_TAG f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65