kylekrein/live-bootstrap
1
0
Fork 0
mirror of https://github.com/fosslinux/live-bootstrap.git synced 2026-03-25 04:26:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(guile-gnutls): use default compile/install while preserving static-only outputs

Browse source
This commit is contained in:
vxtls 2026-03-05 12:18:11 -05:00
parent 51019e232f
commit d150b48eef
3 changed files with 43 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

13
steps-guix/guile-gnutls-v5.0.1/patches/build-target-depends-on-built-sources.patch Normal file
View file

@ -0,0 +1,13 @@
--- guile-gnutls-v5.0.1/guile/src/Makefile.am
+++ guile-gnutls-v5.0.1/guile/src/Makefile.am
@@ -46,6 +46,10 @@ guileextension_LTLIBRARIES = guile-gnutls-v-2.la
# <https://lists.gnutls.org/pipermail/gnutls-devel/2014-December/007294.html>.
guile_gnutls_v_2_la_LDFLAGS = -module -no-undefined
+# When this specific libtool target is built directly, force generation of
+# Automake built sources (e.g. enums.h) first.
+guile-gnutls-v-2.la: $(BUILT_SOURCES)
+
guile_gnutls_v_2_la_SOURCES = core.c errors.c utils.c
guile_gnutls_v_2_la_CFLAGS = \
$(AM_CFLAGS) $(GNULIB_CFLAGS) $(GUILE_CFLAGS) $(GNUTLS_CFLAGS)

33
steps-guix/guile-gnutls-v5.0.1/patches/static-init-from-main-program.patch
View file

@ -1,11 +1,13 @@
SPDX-License-Identifier: GPL-3.0-or-later
In static bootstrap profile, initialize bindings from symbols linked into the
main Guile executable rather than loading a shared extension object.
Make Guile module initialization work in both static and shared builds without
relying on GNUTLS_GUILE_CROSS_COMPILING. Prefer symbols linked into the main
program (static profile), and fall back to load-extension when they are not
available.
--- guile-gnutls-v5.0.1/guile/modules/gnutls.in
+++ guile-gnutls-v5.0.1/guile/modules/gnutls.in
@@ -817,11 +817,9 @@
@@ -817,11 +817,18 @@
;; save 'extensiondir' only if it's different from what Guile expects.
@maybe_guileextensiondir@))
@ -14,9 +16,28 @@ main Guile executable rather than loading a shared extension object.
- (string-append %libdir "/guile-gnutls-v-2")
- "guile-gnutls-v-2")
- "scm_init_gnutls")))
+ (unless (getenv "GNUTLS_GUILE_CROSS_COMPILING")
+ (dynamic-call "scm_init_gnutls"
+ (dynamic-link #f))))
+ ;; Static profile: bindings are linked into the main program.
+ ;; Shared profile: fall back to loading the extension.
+ (let* ((self-handle (false-if-exception (dynamic-link #f)))
+ (loaded-in-place?
+ (and self-handle
+ (false-if-exception
+ (dynamic-call "scm_init_gnutls" self-handle)))))
+ (unless loaded-in-place?
+ (load-extension (if %libdir
+ (string-append %libdir "/guile-gnutls-v-2")
+ "guile-gnutls-v-2")
+ "scm_init_gnutls"))))
(define-syntax define-deprecated
(lambda (s)
@@ -866,7 +873,8 @@
(define certificate-verify/allow-any-x509-v1-ca-certificate #f)
(define certificate-verify/allow-x509-v1-ca-certificate #f)
-(unless (getenv "GNUTLS_GUILE_CROSS_COMPILING")
+(when (module-variable (current-module) 'protocol/ssl3)
+
;; Renaming.
(set! protocol/ssl-3 protocol/ssl3)
(set! protocol/tls-1.0 protocol/tls1-0)