guile: Do not attempt to load shared object when cross-compiling.

Reported by Helmut Grohne <helmut@subdivi.de>
and Andreas Metzler <ametzler@bebt.de>
at <https://bugs.debian.org/943905>.

* configure.ac: Add 'CROSS_COMPILING' conditional.
* guile/Makefile.am (CROSS_COMPILING_VARIABLE): New variable.
(%.go): Use it.
* guile/modules/gnutls.in <top level>: Do not call 'load-extension'
when "GNUTLS_GUILE_CROSS_COMPILING" is defined.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>

diff --git a/configure.ac b/configure.ac
index 73c560406e3672e5cb58d0542374705991a8551e..30dd51743749a8de39996dc3f72837ce734e9519 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1000,6 +1000,7 @@ fi
 
 AM_CONDITIONAL([HAVE_GUILE], [test "$opt_guile_bindings" = "yes"])
 AM_CONDITIONAL([HAVE_GUILD], [test "x$GUILD" != "x"])
+AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" = "xyes"])
 
 LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS"
 LIBGNUTLS_CFLAGS="-I${includedir}"

diff --git a/guile/Makefile.am b/guile/Makefile.am
index 0b19bad90f8653f2e684805c43f241318e43eb4a..13539eefbd7c4c79b0d884c8bf3c1eddfc867b0c 100644 (file)
--- a/guile/Makefile.am
+++ b/guile/Makefile.am
@@ -69,6 +69,12 @@ AM_V_GUILEC = $(AM_V_GUILEC_$(V))
 AM_V_GUILEC_ = $(AM_V_GUILEC_$(AM_DEFAULT_VERBOSITY))
 AM_V_GUILEC_0 = @echo "  GUILEC  " $@;
 
+if CROSS_COMPILING
+CROSS_COMPILING_VARIABLE = GNUTLS_GUILE_CROSS_COMPILING=yes
+else
+CROSS_COMPILING_VARIABLE =
+endif
+
 # Make sure 'gnutls.scm' is built first.
 # Unset 'GUILE_LOAD_COMPILED_PATH' so we can be sure that any .go file that we
 # load comes from the build directory.
@@ -78,6 +84,7 @@ AM_V_GUILEC_0 = @echo "  GUILEC  " $@;
        $(AM_V_GUILEC)$(MKDIR_P) "`dirname "$@"`" ;                     \
        $(AM_V_P) && out=1 || out=- ;                                   \
        unset GUILE_LOAD_COMPILED_PATH ; LC_ALL=C                       \
+       $(CROSS_COMPILING_VARIABLE)                                     \
        GNUTLS_GUILE_EXTENSION_DIR="$(abs_top_builddir)/guile/src"      \
        $(GUILD) compile --target="$(host)"                             \
          -L "$(top_builddir)/guile/modules"                            \

diff --git a/guile/modules/gnutls.in b/guile/modules/gnutls.in
index 7cd08f18f1096780a3003038ad737d65842bce2e..2c84d4c3e508f9db67040f3e282ab4a47e045139 100644 (file)
--- a/guile/modules/gnutls.in
+++ b/guile/modules/gnutls.in
@@ -521,8 +521,9 @@
     (or (getenv "GNUTLS_GUILE_EXTENSION_DIR")
         "@guileextensiondir@"))
 
-  (load-extension (string-append %libdir "/guile-gnutls-v-2")
-                  "scm_init_gnutls"))
+  (unless (getenv "GNUTLS_GUILE_CROSS_COMPILING")
+    (load-extension (string-append %libdir "/guile-gnutls-v-2")
+                    "scm_init_gnutls")))
 
 (cond-expand
   ((not guile-2)