kylekrein/live-bootstrap
1
0
Fork 0
mirror of https://github.com/fosslinux/live-bootstrap.git synced 2026-03-24 20:16:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(guile-gnutls): keep guile include flags available for snarf in static build

Browse source
This commit is contained in:
vxtls 2026-03-05 14:15:33 -05:00
parent 2cb4ec57b4
commit 77835778d7
1 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,18 +10,24 @@
# Files generated by the (gnutls build ...) modules. # Files generated by the (gnutls build ...) modules.
GENERATED_BINDINGS = \ GENERATED_BINDINGS = \
@@ -35,6 +36,7 @@ @@ -35,6 +36,10 @@
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)
+guile_gnutls_common_cflags = \
+ $(AM_CFLAGS) $(GNULIB_CFLAGS) $(GUILE_CFLAGS) $(GNUTLS_CFLAGS)
+
+if ENABLE_SHARED +if ENABLE_SHARED
guileextension_LTLIBRARIES = guile-gnutls-v-2.la guileextension_LTLIBRARIES = guile-gnutls-v-2.la
# Use '-module' to build a "dlopenable module", in Libtool terms. # Use '-module' to build a "dlopenable module", in Libtool terms.
@@ -45,10 +47,26 @@ @@ -43,12 +48,26 @@
guile_gnutls_v_2_la_LDFLAGS = -module -no-undefined
guile_gnutls_v_2_la_SOURCES = core.c errors.c utils.c guile_gnutls_v_2_la_SOURCES = core.c errors.c utils.c
guile_gnutls_v_2_la_CFLAGS = \ -guile_gnutls_v_2_la_CFLAGS = \
$(AM_CFLAGS) $(GNULIB_CFLAGS) $(GUILE_CFLAGS) $(GNUTLS_CFLAGS) - $(AM_CFLAGS) $(GNULIB_CFLAGS) $(GUILE_CFLAGS) $(GNUTLS_CFLAGS)
+guile_gnutls_v_2_la_CFLAGS = $(guile_gnutls_common_cflags)
+guile_gnutls_v_2_la_DEPENDENCIES = $(BUILT_SOURCES) +guile_gnutls_v_2_la_DEPENDENCIES = $(BUILT_SOURCES)
guile_gnutls_v_2_la_LIBADD = \ guile_gnutls_v_2_la_LIBADD = \
$(GNUTLS_LIBS) \ $(GNUTLS_LIBS) \
@ -30,14 +36,13 @@
+lib_LIBRARIES = libguile-gnutls-static.a +lib_LIBRARIES = libguile-gnutls-static.a
+libguile_gnutls_static_a_SOURCES = core.c errors.c utils.c +libguile_gnutls_static_a_SOURCES = core.c errors.c utils.c
+libguile_gnutls_static_a_CPPFLAGS = $(AM_CPPFLAGS) +libguile_gnutls_static_a_CPPFLAGS = $(AM_CPPFLAGS)
+libguile_gnutls_static_a_CFLAGS = \ +libguile_gnutls_static_a_CFLAGS = $(guile_gnutls_common_cflags)
+ $(AM_CFLAGS) $(GNULIB_CFLAGS) $(GUILE_CFLAGS) $(GNUTLS_CFLAGS)
+libguile_gnutls_static_a_DEPENDENCIES = $(BUILT_SOURCES) +libguile_gnutls_static_a_DEPENDENCIES = $(BUILT_SOURCES)
+bin_PROGRAMS = guile +bin_PROGRAMS = guile
+guile_SOURCES = guile-static-main.c +guile_SOURCES = guile-static-main.c
+guile_CPPFLAGS = $(AM_CPPFLAGS) +guile_CPPFLAGS = $(AM_CPPFLAGS)
+guile_CFLAGS = $(AM_CFLAGS) $(GNULIB_CFLAGS) $(GUILE_CFLAGS) $(GNUTLS_CFLAGS) +guile_CFLAGS = $(guile_gnutls_common_cflags)
+guile_LDFLAGS = -static +guile_LDFLAGS = -static
+guile_LDADD = libguile-gnutls-static.a $(GUILE_LDFLAGS) $(GNUTLS_LIBS) +guile_LDADD = libguile-gnutls-static.a $(GUILE_LDFLAGS) $(GNUTLS_LIBS)
+endif +endif
@ -45,6 +50,15 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/lib/includes \ -I$(top_srcdir)/lib/includes \
-I$(top_builddir)/lib/includes \ -I$(top_builddir)/lib/includes \
@@ -102,7 +121,7 @@
# `$(GUILE_CFLAGS)' may contain a series of `-I' switches so it must be
# included here, even though we'd really want `$(GUILE_CPPFLAGS)'.
snarfcppopts = $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(CFLAGS) $(guile_gnutls_v_2_la_CFLAGS)
+ $(CFLAGS) $(guile_gnutls_common_cflags)
# Note: we cannot use the portable ".c.x" form, since that leads
# prerequisites to be ignored:
--- /dev/null --- /dev/null
+++ guile-gnutls-v5.0.1/guile/src/guile-static-main.c +++ guile-gnutls-v5.0.1/guile/src/guile-static-main.c
@@ -0,0 +1,18 @@ @@ -0,0 +1,18 @@