Merge remote-tracking branch 'origin/develop' into dev_selfbuild

GeniusVentures · Jan 22, 2025 · 0475f7e · 0475f7e
2 parents f1262a5 + 58d19c0
commit 0475f7e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/build/OSX/Openssl-build/build.sh b/build/OSX/Openssl-build/build.sh
@@ -54,7 +54,7 @@ LIB_DIR="$INSTALL_DIR/lib"
 
 if $X86_64_PRESENT; then
   if [ ! -f "Makefile" ]; then
-    $SRC_DIR/Configure $DEBUG_FLAGS darwin64-x86_64-cc -static --prefix=$BUILD_DIR --openssldir=$BUILD_DIR -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET
+    $SRC_DIR/Configure $DEBUG_FLAGS darwin64-x86_64-cc no-asm -static --prefix=$BUILD_DIR --openssldir=$BUILD_DIR -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET
   fi
   make build_generated libcrypto.a libssl.a
   make install_dev
@@ -85,7 +85,7 @@ if $X86_64_PRESENT && $ARM64_PRESENT; then
   mv $LIB_DIR/libcrypto.a $LIB_DIR/libcryptotemp.a 
 
   lipo -create $ARM64_DIR/libssl.a $LIB_DIR/libssltemp.a -output $LIB_DIR/libssl.a
-  lipo -create $ARM64_DIR/libcrypto.a $LIB_DIR/libssltemp.a -output $LIB_DIR/libcrypto.a
+  lipo -create $ARM64_DIR/libcrypto.a $LIB_DIR/libcryptotemp.a -output $LIB_DIR/libcrypto.a
   rm -rf $ARM64_DIR
   rm $LIB_DIR/libssltemp.a 
   rm $LIB_DIR/libcryptotemp.a 

diff --git a/ipfs-lite-cpp b/ipfs-lite-cpp
diff --git a/ipfs-pubsub b/ipfs-pubsub
diff --git a/rocksdb b/rocksdb
diff --git a/wallet-core b/wallet-core
+0 −1		ipfs_lite/dht/kademlia_dht.hpp
+2 −1		ipfs_lite/ipfs/merkledag/CMakeLists.txt
+1 −0		src/ipfs_pubsub/gossip_pubsub.cpp
+0 −2		src/ipfs_pubsub/gossip_pubsub.hpp
+1 −0		src/Solana/CompiledInstruction.cpp
+1 −0		src/Solana/LegacyMessage.cpp
+1 −0		src/Solana/Transaction.cpp
+1 −0		src/Solana/VersionedTransaction.cpp
+3 −3		tools/rust-bindgen