From ccbe63c2b07ec5a997609b7de7ae853dcd61a89c Mon Sep 17 00:00:00 2001
From: Praveen Erode Mohanasundaram <praveen.em@gmail.com>
Date: Sun, 28 Apr 2024 21:15:01 +0100
Subject: [PATCH 1/2] fix: use cross for x86_64 builds

---
 rust/pact_ffi/release-linux.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rust/pact_ffi/release-linux.sh b/rust/pact_ffi/release-linux.sh
index 972d5dcd9..08cb70988 100755
--- a/rust/pact_ffi/release-linux.sh
+++ b/rust/pact_ffi/release-linux.sh
@@ -15,7 +15,8 @@ cargo_flags=( "$@" )
 
 # Build the x86_64 GNU linux release
 build_x86_64_gnu() {
-    cargo build --target x86_64-unknown-linux-gnu "${cargo_flags[@]}"
+    install_cross
+    cross build --target x86_64-unknown-linux-gnu "${cargo_flags[@]}"
 
     if [[ "${cargo_flags[*]}" =~ "--release" ]]; then
         gzip_and_sum \
@@ -29,7 +30,8 @@ build_x86_64_gnu() {
 
 build_x86_64_musl() {
     sudo apt-get install -y musl-tools
-    cargo build --target x86_64-unknown-linux-musl "${cargo_flags[@]}"
+    install_cross
+    cross build --target x86_64-unknown-linux-musl "${cargo_flags[@]}"
 
     if [[ "${cargo_flags[*]}" =~ "--release" ]]; then
         BUILD_SCRIPT=$(cat <<EOM

From f7cba3d270e2cf73551db6d6fc873786f08c655d Mon Sep 17 00:00:00 2001
From: Praveen Erode Mohanasundaram <praveen.em@gmail.com>
Date: Mon, 29 Apr 2024 18:18:57 +0100
Subject: [PATCH 2/2] revert back and try docker instead of cross

---
 rust/pact_ffi/release-linux.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/rust/pact_ffi/release-linux.sh b/rust/pact_ffi/release-linux.sh
index 08cb70988..00f7f057f 100755
--- a/rust/pact_ffi/release-linux.sh
+++ b/rust/pact_ffi/release-linux.sh
@@ -15,8 +15,14 @@ cargo_flags=( "$@" )
 
 # Build the x86_64 GNU linux release
 build_x86_64_gnu() {
-    install_cross
-    cross build --target x86_64-unknown-linux-gnu "${cargo_flags[@]}"
+        BUILD_SCRIPT=$(cat <<EOM
+cd /app && \
+cargo build --target x86_64-unknown-linux-gnu
+EOM
+        )
+
+    # Using rust:buster image to build with glibc 2.28 
+    docker run --rm -v $RUST_DIR:/app --platform linux/amd64 rust:buster /bin/sh -c "$BUILD_SCRIPT" "${cargo_flags[@]}"
 
     if [[ "${cargo_flags[*]}" =~ "--release" ]]; then
         gzip_and_sum \
@@ -30,8 +36,7 @@ build_x86_64_gnu() {
 
 build_x86_64_musl() {
     sudo apt-get install -y musl-tools
-    install_cross
-    cross build --target x86_64-unknown-linux-musl "${cargo_flags[@]}"
+    cargo build --target x86_64-unknown-linux-musl "${cargo_flags[@]}"
 
     if [[ "${cargo_flags[*]}" =~ "--release" ]]; then
         BUILD_SCRIPT=$(cat <<EOM