Skip to content

Depends Perpetual #10222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
tobtoht wants to merge 9 commits into
base: master
Choose a base branch
from
+74 −25
Draft

Depends Perpetual #10222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6d0510a
depends: android_ndk: update to 29
tobtoht Nov 2, 2025
f65fa2a
depends: darwin_sdk: update to 26.1.1
tobtoht Nov 2, 2025
da73f16
depends: freebsd_base: update to 15.0
tobtoht Nov 2, 2025
9f1c300
depends: libusb: update to 1.0.29
tobtoht Nov 2, 2025
cf247a4
depends: sodium: update to 1.0.21
tobtoht Nov 2, 2025
8af96ae
depends: unbound: update to 1.24.2
tobtoht Nov 2, 2025
acd2b1a
depends: boost: update to 1.90.0
tobtoht Dec 13, 2025
7da264d
depends: openssl: update to 3.6.1
tobtoht Dec 24, 2025
c835319
depends: readline: update to 8.3
tobtoht Dec 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contrib/depends/hosts/android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ANDROID_API=21
ANDROID_API=28

ifeq ($(host_arch),arm)
host_toolchain=armv7a-linux-androideabi$(ANDROID_API)-
Expand Down
6 changes: 3 additions & 3 deletions contrib/depends/hosts/darwin.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
OSX_MIN_VERSION=11.0
OSX_SDK_VERSION=11.0
XCODE_VERSION=12.2
XCODE_BUILD_ID=12B45b
OSX_SDK_VERSION=14.0
XCODE_VERSION=26.1.1
XCODE_BUILD_ID=17B100
LD64_VERSION=711

OSX_SDK=$(host_prefix)/native/SDK
Expand Down
6 changes: 4 additions & 2 deletions contrib/depends/hosts/freebsd.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
FREEBSD_VERSION=15.0

freebsd_CC=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \
-u OBJC_INCLUDE_PATH -u OBJCPLUS_INCLUDE_PATH -u CPATH \
-u LIBRARY_PATH clang --target=$(host) --sysroot=$(host_prefix)/native -iwithsysroot/usr/include
-u LIBRARY_PATH clang --target=$(host)$(FREEBSD_VERSION) --sysroot=$(host_prefix)/native -iwithsysroot/usr/include
freebsd_CXX=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \
-u OBJC_INCLUDE_PATH -u OBJCPLUS_INCLUDE_PATH -u CPATH \
-u LIBRARY_PATH clang++ --target=$(host) -stdlib=libc++ --sysroot=$(host_prefix)/native \
-u LIBRARY_PATH clang++ --target=$(host)$(FREEBSD_VERSION) -stdlib=libc++ --sysroot=$(host_prefix)/native \
-iwithsysroot/usr/include/c++/v1 -iwithsysroot/usr/include

freebsd_AR=ar
Expand Down
4 changes: 2 additions & 2 deletions contrib/depends/packages/android_ndk.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package=android_ndk
$(package)_version=27c
$(package)_version=29
$(package)_download_path=https://dl.google.com/android/repository/
$(package)_file_name=android-ndk-r$($(package)_version)-linux.zip
$(package)_sha256_hash=59c2f6dc96743b5daf5d1626684640b20a6bd2b1d85b13156b90333741bad5cc
$(package)_sha256_hash=4abbbcdc842f3d4879206e9695d52709603e52dd68d3c1fff04b3b5e7a308ecf

define $(package)_extract_cmds
echo $($(package)_sha256_hash) $($(1)_source_dir)/$($(package)_file_name) | sha256sum -c &&\
Expand Down
4 changes: 2 additions & 2 deletions contrib/depends/packages/boost.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package=boost
$(package)_version=1.89.0
$(package)_version=1.90.0
$(package)_download_path=https://github.com/boostorg/boost/releases/download/boost-$($(package)_version)
$(package)_file_name=boost-$($(package)_version)-b2-nodocs.tar.gz
$(package)_sha256_hash=aa25e7b9c227c21abb8a681efd4fe6e54823815ffc12394c9339de998eb503fb
$(package)_sha256_hash=e848446c6fec62d8a96b44ed7352238b3de040b8b9facd4d6963b32f541e00f5

define $(package)_set_vars
$(package)_config_opts_release=variant=release
Expand Down
6 changes: 3 additions & 3 deletions contrib/depends/packages/darwin_sdk.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package=darwin_sdk
$(package)_version=12.2
$(package)_version=26.1.1
$(package)_download_path=https://bitcoincore.org/depends-sources/sdks
$(package)_file_name=Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers.tar.gz
$(package)_sha256_hash=df75d30ecafc429e905134333aeae56ac65fac67cb4182622398fd717df77619
$(package)_file_name=Xcode-26.1.1-17B100-extracted-SDK-with-libcxx-headers.tar
$(package)_sha256_hash=9600fa93644df674ee916b5e2c8a6ba8dacf631996a65dc922d003b98b5ea3b1

# Prevent clang from including readline headers from the SDK. We statically link
# our own version of readline.
Expand Down
4 changes: 2 additions & 2 deletions contrib/depends/packages/freebsd_base.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package=freebsd_base
$(package)_version=12.3
$(package)_version=15.0
$(package)_download_path=https://archive.freebsd.org/old-releases/amd64/$($(package)_version)-RELEASE/
$(package)_download_file=base.txz
$(package)_file_name=freebsd-base-$($(package)_version).txz
$(package)_sha256_hash=e85b256930a2fbc04b80334106afecba0f11e52e32ffa197a88d7319cf059840
$(package)_sha256_hash=ac0c933cc02ee8af4da793f551e4a9a15cdcf0e67851290b1e8c19dd6d30bba8

define $(package)_extract_cmds
echo $($(package)_sha256_hash) $($(1)_source_dir)/$($(package)_file_name) | sha256sum -c &&\
Expand Down
4 changes: 2 additions & 2 deletions contrib/depends/packages/libusb.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package=libusb
$(package)_version=1.0.27
$(package)_version=1.0.29
$(package)_download_path=https://github.com/libusb/libusb/releases/download/v$($(package)_version)
$(package)_file_name=$(package)-$($(package)_version).tar.bz2
$(package)_sha256_hash=ffaa41d741a8a3bee244ac8e54a72ea05bf2879663c098c82fc5757853441575
$(package)_sha256_hash=5977fc950f8d1395ccea9bd48c06b3f808fd3c2c961b44b0c2e6e29fc3a70a85

define $(package)_preprocess_cmds
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
Expand Down
4 changes: 2 additions & 2 deletions contrib/depends/packages/openssl.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package=openssl
$(package)_version=3.5.4
$(package)_version=3.6.1
$(package)_download_path=https://github.com/openssl/openssl/releases/download/openssl-$($(package)_version)
$(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_sha256_hash=967311f84955316969bdb1d8d4b983718ef42338639c621ec4c34fddef355e99
$(package)_sha256_hash=b1bfedcd5b289ff22aee87c9d600f515767ebf45f77168cb6d64f231f518a82e
$(package)_patches=fix-android.patch

define $(package)_set_vars
Expand Down
4 changes: 2 additions & 2 deletions contrib/depends/packages/readline.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package=readline
$(package)_version=8.0
$(package)_version=8.3
$(package)_download_path=https://ftp.gnu.org/gnu/readline
$(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_sha256_hash=e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461
$(package)_sha256_hash=fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc
$(package)_dependencies=ncurses

define $(package)_set_vars
Expand Down
6 changes: 4 additions & 2 deletions contrib/depends/packages/sodium.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
package=sodium
$(package)_version=1.0.18
$(package)_version=1.0.21
$(package)_download_path=https://download.libsodium.org/libsodium/releases/
$(package)_file_name=libsodium-$($(package)_version).tar.gz
$(package)_sha256_hash=6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1
$(package)_sha256_hash=9e4285c7a419e82dedb0be63a72eea357d6943bc3e28e6735bf600dd4883feaf
$(package)_patches=fix-aarch64.patch

define $(package)_set_vars
$(package)_config_opts=--enable-static --disable-shared
$(package)_config_opts+=--prefix=$(host_prefix)
endef

define $(package)_preprocess_cmds
patch -p1 < $($(package)_patch_dir)/fix-aarch64.patch &&\
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub build-aux
endef

Expand Down
4 changes: 2 additions & 2 deletions contrib/depends/packages/unbound.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package=unbound
$(package)_version=1.22.0
$(package)_version=1.24.2
$(package)_download_path=https://www.nlnetlabs.nl/downloads/$(package)/
$(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_sha256_hash=c5dd1bdef5d5685b2cedb749158dd152c52d44f65529a34ac15cd88d4b1b3d43
$(package)_sha256_hash=44e7b53e008a6dcaec03032769a212b46ab5c23c105284aa05a4f3af78e59cdb
$(package)_dependencies=openssl
$(package)_patches=no-expat.patch

Expand Down
44 changes: 44 additions & 0 deletions contrib/depends/patches/sodium/fix-aarch64.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
From 6702f69bef6044163acc7715e6ac7e430890ce78 Mon Sep 17 00:00:00 2001
From: Frank Denis <[email protected]>
Date: Wed, 7 Jan 2026 12:00:49 +0100
Subject: [PATCH] Fix compilation with GCC on aarch64

Use unsigned NEON intrinsics everywhere

Fixes #1502

diff --git a/src/libsodium/crypto_ipcrypt/ipcrypt_armcrypto.c b/src/libsodium/crypto_ipcrypt/ipcrypt_armcrypto.c
index c5a27e92..bad4ce38 100644
--- a/src/libsodium/crypto_ipcrypt/ipcrypt_armcrypto.c
+++ b/src/libsodium/crypto_ipcrypt/ipcrypt_armcrypto.c
@@ -37,7 +37,7 @@ typedef uint64x2_t BlockVec;
# define XOR128_3(a, b, c) veorq_u64(veorq_u64((a), (b)), (c))
# define SET64x2(a, b) vsetq_lane_u64((uint64_t) (a), vmovq_n_u64((uint64_t) (b)), 1)
# define BYTESHL128(a, b) \
- vreinterpretq_u64_u8(vextq_s8(vdupq_n_s8(0), vreinterpretq_s8_u64(a), 16 - (b)))
+ vreinterpretq_u64_u8(vextq_u8(vdupq_n_u8(0), vreinterpretq_u8_u64(a), 16 - (b)))

# define AES_XENCRYPT(block_vec, rkey) \
vreinterpretq_u64_u8( \
@@ -348,12 +348,12 @@ pfx_set_bit(uint8_t ip16[16], const unsigned int bit_index, const uint8_t bit_va
static void
pfx_shift_left(uint8_t ip16[16])
{
- BlockVec v = LOAD128(ip16);
- const BlockVec shl = vshlq_n_u8(vreinterpretq_u8_u64(v), 1);
- const BlockVec msb = vshrq_n_u8(vreinterpretq_u8_u64(v), 7);
- const BlockVec zero = vdupq_n_u8(0);
- const BlockVec carries = vextq_u8(vreinterpretq_u8_u64(msb), zero, 1);
- v = vreinterpretq_u64_u8(vorrq_u8(shl, carries));
+ BlockVec v = LOAD128(ip16);
+ const uint8x16_t shl = vshlq_n_u8(vreinterpretq_u8_u64(v), 1);
+ const uint8x16_t msb = vshrq_n_u8(vreinterpretq_u8_u64(v), 7);
+ const uint8x16_t zero = vdupq_n_u8(0);
+ const uint8x16_t carries = vextq_u8(msb, zero, 1);
+ v = vreinterpretq_u64_u8(vorrq_u8(shl, carries));
STORE128(ip16, v);
}

--
2.52.0

1 change: 1 addition & 0 deletions contrib/guix/libexec/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ case "$HOST" in
# See depends/hosts/darwin.mk for more details.
;;
*android*)
# Make sure ld knows where to find dynamically linked libraries for the precompiled Android NDK toolchain.
export LD_LIBRARY_PATH="$(find /gnu/store -maxdepth 1 -name "*zlib*" | sort | head -n 1)/lib:$(find /gnu/store -maxdepth 1 -name "*gcc-14*-lib" | sort | head -n 1)/lib"
;;
*linux-gnu*)
Expand Down
Loading