Add patch for Hashtree library, which fixes linking warning

NilFoundation · May 27, 2024 · 748620c · 748620c
1 parent e39ddf5
commit 748620c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/nix/hashtree/hashtree-execstack-fix.diff b/nix/hashtree/hashtree-execstack-fix.diff
@@ -0,0 +1,15 @@
+diff --git a/src/sha256_shani.S b/src/sha256_shani.S
+index 6599e02..cabc11f 100644
+--- a/src/sha256_shani.S
++++ b/src/sha256_shani.S
+@@ -973,5 +973,9 @@ hashtree_sha256_shani_x2:
+ 	movdqa		xmm15, [rsp + 9*16]
+ #endif
+ 	add		rsp, frame_size
+-	ret	
++	ret 
++#ifdef __linux__ 
++.size hashtree_sha256_shani_x2,.-hashtree_sha256_shani_x2
++.section .note.GNU-stack,"",@progbits
++#endif
+ #endif
diff --git a/nix/hashtree/hashtree.nix b/nix/hashtree/hashtree.nix
@@ -20,6 +20,10 @@ stdenv.mkDerivation rec {
       hash = "sha256-DHoFX8mbn4QKGj5Ch6R87swsoqXUXDweGL2KYjRVZEg=";
     };
 
+  patches = [
+    ./hashtree-execstack-fix.diff
+  ];
+
   outputs = [ "out" ];
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-no-integrated-as -std=c2x";