From 494b08cdb26d3732846d74d88dc883fc9fdd0895 Mon Sep 17 00:00:00 2001 From: vxtls <187420201+vxtls@users.noreply.github.com> Date: Tue, 24 Feb 2026 22:51:18 -0500 Subject: [PATCH] fix(steps-guix/libtasn1): bootstrap with local gnulib bundle via GNULIB_SRCDIR and no-git --- steps-guix/libtasn1-v4.21.0/pass1.sh | 28 ++++++++++++++++++++++++++++ steps-guix/libtasn1-v4.21.0/sources | 2 ++ steps-guix/manifest | 8 ++++---- steps-guix/nettle-3.10.2/pass1.sh | 26 ++++++++++++++++++++++++++ steps-guix/nettle-3.10.2/sources | 1 + 5 files changed, 61 insertions(+), 4 deletions(-) create mode 100644 steps-guix/libtasn1-v4.21.0/pass1.sh create mode 100644 steps-guix/libtasn1-v4.21.0/sources create mode 100644 steps-guix/nettle-3.10.2/pass1.sh create mode 100644 steps-guix/nettle-3.10.2/sources diff --git a/steps-guix/libtasn1-v4.21.0/pass1.sh b/steps-guix/libtasn1-v4.21.0/pass1.sh new file mode 100644 index 00000000..8d38aa08 --- /dev/null +++ b/steps-guix/libtasn1-v4.21.0/pass1.sh @@ -0,0 +1,28 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +src_prepare() { + default + + GNULIB_SRCDIR="$(realpath ../gnulib-e93789d)" \ + ./bootstrap --no-git +} + +src_configure() { + local host_triplet + host_triplet="$(gcc -dumpmachine)" + + PATH="${PREFIX}/bin:/usr/bin:/bin" \ + ./configure \ + --prefix="${PREFIX}" \ + --libdir="${LIBDIR}" \ + --host="${host_triplet}" \ + --build="${host_triplet}" +} + +src_compile() { + default_src_compile +} + +src_install() { + default_src_install +} diff --git a/steps-guix/libtasn1-v4.21.0/sources b/steps-guix/libtasn1-v4.21.0/sources new file mode 100644 index 00000000..5a610629 --- /dev/null +++ b/steps-guix/libtasn1-v4.21.0/sources @@ -0,0 +1,2 @@ +f https://ftp.gnu.org/gnu/libtasn1/libtasn1-v4.21.0-src.tar.gz 06f7d0f77b38db3b6b17a3d54d590874e5e589bea8081329a8a3acfbec3dfe21 libtasn1-v4.21.0-src.tar.gz +g https://https.git.savannah.gnu.org/git/gnulib.git~e93789db7e86c51d6cb9683ea508e676a55cdefa _ 33288ab97229f9f957fe45256edc1e295cb4f86e355af02ea73c1085b0470dd3 gnulib-e93789d.tar.gz diff --git a/steps-guix/manifest b/steps-guix/manifest index 225cb11d..c3a30814 100644 --- a/steps-guix/manifest +++ b/steps-guix/manifest @@ -19,8 +19,8 @@ build: guile-gcrypt-0.5.0 build: git-2.53.0 build: cmake-4.2.3 build: libgit2-1.9.2 -# build: nettle-3.10.2 -# build: libtasn1-v4.21.0 -# build: p11-kit-0.26.2 -# build: +build: nettle-3.10.2 +build: libtasn1-v4.21.0 +build: p11-kit-0.26.2 + improve: after diff --git a/steps-guix/nettle-3.10.2/pass1.sh b/steps-guix/nettle-3.10.2/pass1.sh new file mode 100644 index 00000000..bfdf902a --- /dev/null +++ b/steps-guix/nettle-3.10.2/pass1.sh @@ -0,0 +1,26 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +src_prepare() { + default +} + +src_configure() { + local host_triplet + host_triplet="$(gcc -dumpmachine)" + + PATH="${PREFIX}/bin:/usr/bin:/bin" \ + ./configure \ + --prefix="${PREFIX}" \ + --libdir="${LIBDIR}" \ + --host="${host_triplet}" \ + --build="${host_triplet}" \ + --disable-documentation +} + +src_compile() { + default_src_compile +} + +src_install() { + default_src_install +} diff --git a/steps-guix/nettle-3.10.2/sources b/steps-guix/nettle-3.10.2/sources new file mode 100644 index 00000000..3025f3d0 --- /dev/null +++ b/steps-guix/nettle-3.10.2/sources @@ -0,0 +1 @@ +f https://ftp.gnu.org/gnu/nettle/nettle-3.10.2.tar.gz fe9ff51cb1f2abb5e65a6b8c10a92da0ab5ab6eaf26e7fc2b675c45f1fb519b5