From 4e27e9e2340a462faaf581d0fca97ed34cf8e548 Mon Sep 17 00:00:00 2001 From: junderw Date: Sun, 5 Oct 2025 17:06:14 +0900 Subject: [PATCH] Remove FreeBSD hack for sysconf with Rust --- production/freebsd/sysconf.patch | 12 ------------ production/install | 17 ----------------- 2 files changed, 29 deletions(-) delete mode 100644 production/freebsd/sysconf.patch diff --git a/production/freebsd/sysconf.patch b/production/freebsd/sysconf.patch deleted file mode 100644 index 30a09baac..000000000 --- a/production/freebsd/sysconf.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/raw.rs 2020-10-22 05:59:43.747207000 +0000 -+++ b/src/raw2.rs 2020-10-22 06:00:04.016688000 +0000 -@@ -82,9 +82,6 @@ - Sc2CharTerm = sc!(_SC_2_CHAR_TERM), - Sc2CVersion = 96, // TODO(joshlf): Switch to a libc constant once it's added - Sc2Upe = sc!(_SC_2_UPE), -- ScXbs5Ilp32Off32 = sc!(_SC_XBS5_ILP32_OFF32), -- ScXbs5Ilp32Offbig = sc!(_SC_XBS5_ILP32_OFFBIG), -- ScXbs5LpbigOffbig = sc!(_SC_XBS5_LPBIG_OFFBIG), - } - - /// Query the system's configuration. diff --git a/production/install b/production/install index 47a4ca5ce..a39500dbb 100755 --- a/production/install +++ b/production/install @@ -1368,23 +1368,6 @@ if [ "${BITCOIN_ELECTRS_INSTALL}" = ON ];then ;; esac - echo "[*] Building Bitcoin Electrs release binary" - osSudo "${BITCOIN_USER}" sh -c "cd ${BITCOIN_ELECTRS_HOME} && cargo run --release --bin electrs -- --version" || true - - case $OS in - FreeBSD*) - echo "[*] Patching Bitcoin Electrs code for FreeBSD" - SYSCONF_DIR=$(find "${BITCOIN_HOME}/.cargo/registry/src" -type d -name "sysconf-0.3.4" | head -n 1) - if [ -n "$SYSCONF_DIR" ]; then - osSudo "${BITCOIN_USER}" sh -c "cd \"$SYSCONF_DIR\" && patch -p1 < \"${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/freebsd/sysconf.patch\"" - else - echo "Warning: Could not find sysconf-0.3.4 directory" - fi - ;; - Debian) - ;; - esac - echo "[*] Building Bitcoin Electrs release binary" osSudo "${BITCOIN_USER}" sh -c "cd ${BITCOIN_ELECTRS_HOME} && cargo run --release --bin electrs -- --version" fi