Skip to content

Commit bb059e4

Browse files
Add sv2 via guix
1 parent 5e3bd1a commit bb059e4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+10894
-13
lines changed

.gitignore

+10
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,16 @@ src/test/fuzz/fuzz
1414
src/test/test_bitcoin
1515
src/qt/test/test_bitcoin-qt
1616

17+
src/rusty/target
18+
src/rusty/sv2-ffi/target
19+
src/rusty/binary-sv2/binary-sv2/target
20+
src/rusty/binary-sv2/no-serde-sv2/codec/target
21+
src/rusty/binary-sv2/no-serde-sv2/derive_codec/target
22+
src/rusty/framing-sv2/target
23+
src/rusty/codec-sv2/target
24+
src/rusty/subprotocols/common-messages/target
25+
src/rusty/subprotocols/template-distribution/target
26+
1727
# autoreconf
1828
Makefile.in
1929
aclocal.m4

contrib/guix/guix-build

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
#!/usr/bin/env bash
2+
3+
## Package all the rust code this step it likely wont be necessary as the rust code will be already
4+
## packehed in a remote src or it will be already avaible as a guix package
5+
./src/rusty/build-for-guix.sh
6+
27
export LC_ALL=C
38
set -e -o pipefail
49

contrib/guix/libexec/build.sh

+4
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ case "$HOST" in
9191
prepend_to_search_env_var OBJCPLUS_INCLUDE_PATH "${zlib_store_path}/include"
9292
esac
9393

94+
# TODO should use store_path
95+
SV2_FFI_DIR=/gnu/store/`ls /gnu/store/ | grep rust-sv2`
96+
9497
# Set environment variables to point the CROSS toolchain to the right
9598
# includes/libs for $HOST
9699
case "$HOST" in
@@ -254,6 +257,7 @@ esac
254257

255258
# CXXFLAGS
256259
HOST_CXXFLAGS="$HOST_CFLAGS"
260+
HOST_CXXFLAGS="${HOST_CXXFLAGS} -I ${SV2_FFI_DIR} ${SV2_FFI_DIR}/libsv2_ffi.a -lpthread -ldl"
257261

258262
case "$HOST" in
259263
arm-linux-gnueabihf) HOST_CXXFLAGS="${HOST_CXXFLAGS} -Wno-psabi" ;;

0 commit comments

Comments
 (0)