From de9e69d96811975fa94182fe03e8873ba6a3c083 Mon Sep 17 00:00:00 2001
From: vertiond <vertion@protonmail.com>
Date: Sun, 10 Sep 2023 16:50:56 -0500
Subject: [PATCH 1/2] vtc: guix builds linux using -fPIE, windows using
 --disable-shared

libbitcoinconsensus-0.dll is not built
---
 contrib/guix/libexec/build.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index 7340b0625f..73a62cf7b2 100755
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -241,11 +241,14 @@ mkdir -p "$OUTDIR"
 
 # CONFIGFLAGS
 CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests --disable-fuzz-binary"
+case "$HOST" in
+    *mingw*) CONFIGFLAGS+=" --disable-shared" ;;
+esac
 
 # CFLAGS
 HOST_CFLAGS="-O2 -g"
 case "$HOST" in
-    *linux*)  HOST_CFLAGS+=" -ffile-prefix-map=${PWD}=." ;;
+    *linux*)  HOST_CFLAGS+=" -ffile-prefix-map=${PWD}=. -fPIE" ;;
     *mingw*)  HOST_CFLAGS+=" -fno-ident" ;;
     *darwin*) unset HOST_CFLAGS ;;
 esac
@@ -357,11 +360,11 @@ mkdir -p "$DISTSRC"
     (
         cd installed
 
-        case "$HOST" in
-            *mingw*)
-                mv --target-directory="$DISTNAME"/lib/ "$DISTNAME"/bin/*.dll
-                ;;
-        esac
+#        case "$HOST" in
+#            *mingw*)
+#                mv --target-directory="$DISTNAME"/lib/ "$DISTNAME"/bin/*.dll
+#                ;;
+#        esac
 
         # Prune libtool and object archives
         find . -name "lib*.la" -delete

From 092c414499bfad07820632a6017db37b32e42557 Mon Sep 17 00:00:00 2001
From: vertiond <vertion@protonmail.com>
Date: Sun, 10 Sep 2023 16:51:34 -0500
Subject: [PATCH 2/2] vtc: don't build tests

---
 contrib/guix/libexec/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index 73a62cf7b2..62e41c4053 100755
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -240,7 +240,7 @@ mkdir -p "$OUTDIR"
 ###########################
 
 # CONFIGFLAGS
-CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests --disable-fuzz-binary"
+CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-tests --disable-fuzz-binary"
 case "$HOST" in
     *mingw*) CONFIGFLAGS+=" --disable-shared" ;;
 esac