e53bf62e31
* gnu/packages/patches/guile-sqlite3-fix-cross-compilation.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/guile.scm (guile-sqlite3)[source]: Apply previous patch, [native-inputs]: add guile.
56 lines
1.8 KiB
Diff
56 lines
1.8 KiB
Diff
From a6e9e62a77ecc5012929613e20da23b2636450a5 Mon Sep 17 00:00:00 2001
|
|
From: Mathieu Othacehe <mathieu.othacehe@parrot.com>
|
|
Date: Mon, 25 Mar 2019 11:00:38 +0100
|
|
Subject: [PATCH] cross compile
|
|
|
|
---
|
|
build-aux/guile.am | 2 +-
|
|
configure.ac | 19 ++++++++++++-------
|
|
2 files changed, 13 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/build-aux/guile.am b/build-aux/guile.am
|
|
index dc1e63f..3126372 100644
|
|
--- a/build-aux/guile.am
|
|
+++ b/build-aux/guile.am
|
|
@@ -16,4 +16,4 @@ EXTRA_DIST = $(SOURCES) $(NOCOMP_SOURCES)
|
|
GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat
|
|
SUFFIXES = .scm .go
|
|
.scm.go:
|
|
- $(AM_V_GEN)$(top_builddir)/env $(GUILE_TOOLS) compile $(GUILE_WARNINGS) -o "$@" "$<"
|
|
+ $(AM_V_GEN)$(top_builddir)/env $(GUILE_TOOLS) compile $(GUILE_TARGET) $(GUILE_WARNINGS) -o "$@" "$<"
|
|
diff --git a/configure.ac b/configure.ac
|
|
index f648fcb..2d34d0a 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -21,15 +21,20 @@ PKG_CHECK_MODULES([SQLITE], [sqlite3])
|
|
SQLITE_LIBDIR="`"$PKG_CONFIG" sqlite3 --variable libdir`"
|
|
AC_SUBST([SQLITE_LIBDIR])
|
|
|
|
-AC_MSG_CHECKING([whether '$SQLITE_LIBDIR/libsqlite3' is usable])
|
|
-GUILE_CHECK([retval],
|
|
- [(dynamic-func \"sqlite3_open_v2\"
|
|
+if test "$cross_compiling" = "no"; then
|
|
+ AC_MSG_CHECKING([whether '$SQLITE_LIBDIR/libsqlite3' is usable])
|
|
+ GUILE_CHECK([retval],
|
|
+ [(dynamic-func \"sqlite3_open_v2\"
|
|
(dynamic-link \"$SQLITE_LIBDIR/libsqlite3\"))])
|
|
-if test "$retval" != 0; then
|
|
- AC_MSG_RESULT([no])
|
|
- AC_MSG_ERROR([failed to load '$SQLITE_LIBDIR/libsqlite3'])
|
|
+ if test "$retval" != 0; then
|
|
+ AC_MSG_RESULT([no])
|
|
+ AC_MSG_ERROR([failed to load '$SQLITE_LIBDIR/libsqlite3'])
|
|
+ else
|
|
+ AC_MSG_RESULT([yes])
|
|
+ fi
|
|
else
|
|
- AC_MSG_RESULT([yes])
|
|
+ GUILE_TARGET="--target=$host_alias"
|
|
+ AC_SUBST([GUILE_TARGET])
|
|
fi
|
|
|
|
AC_CONFIG_FILES([Makefile sqlite3.scm])
|
|
--
|
|
2.17.1
|
|
|