aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-08-29 12:27:38 +0200
committerLudovic Courtès <ludo@gnu.org>2020-08-29 16:24:17 +0200
commitf5d3a1690cb78ce9413b78352f1030bf4801617a (patch)
treed5fc79eccb56295f74fd2315876ce4c33152a4e8
parent6c77a5040604ebb7c0196f47520cf5fcc30c2087 (diff)
downloadguix-f5d3a1690cb78ce9413b78352f1030bf4801617a.tar
guix-f5d3a1690cb78ce9413b78352f1030bf4801617a.tar.gz
build: Remove check for Guile 2.2.1 bug.
This check is unnecessary since e688c2df3924423b67892cc9939ca099c729d1cb. * m4/guix.m4 (GUIX_ASSERT_SYNTAX_OBJECT_EQUAL): Remove. * configure.ac: Remove user.
-rw-r--r--configure.ac4
-rw-r--r--m4/guix.m420
2 files changed, 0 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac
index 5d549cc3af..7959d08cd7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -171,10 +171,6 @@ AM_CONDITIONAL([ENABLE_INSTALLER],
dnl Make sure we have a full-fledged Guile.
GUIX_ASSERT_GUILE_FEATURES([regex posix socket net-db threads])
-dnl Make sure we don't suffer from the bug in 'equal?' wrt. syntax objects
-dnl found in 2.2.1. See <https://bugs.gnu.org/29903>.
-GUIX_ASSERT_SYNTAX_OBJECT_EQUAL
-
AC_PROG_SED
dnl Decompressors, for use by the substituter and other modules.
diff --git a/m4/guix.m4 b/m4/guix.m4
index b7bf74ccc8..7256e792a5 100644
--- a/m4/guix.m4
+++ b/m4/guix.m4
@@ -118,26 +118,6 @@ AC_DEFUN([GUIX_ASSERT_GUILE_FEATURES], [
done
])
-dnl GUIX_ASSERT_SYNTAX_OBJECT_EQUAL
-dnl
-dnl Guile 2.2.1 was a brown-paper-bag release where 'equal?' wouldn't work
-dnl for syntax objects, which broke gexps. Unfortunately Fedora 25 provides it.
-dnl Reject it.
-AC_DEFUN([GUIX_ASSERT_SYNTAX_OBJECT_EQUAL], [
- AC_CACHE_CHECK([whether 'equal?' works for syntax objects],
- [ac_cv_guix_syntax_object_equal],
- [if "$GUILE" -c '(exit (equal? (syntax x) (syntax x)))'
- then
- ac_cv_guix_syntax_object_equal=yes
- else
- ac_cv_guix_syntax_object_equal=no
- fi])
- if test "x$ac_cv_guix_syntax_object_equal" != xyes; then
- # This bug was present in Guile 2.2.1 only.
- AC_MSG_ERROR(['equal?' does not work for syntax object; upgrade to Guile 2.2.2 or later.])
- fi
-])
-
dnl GUIX_CHECK_GUILE_SSH
dnl
dnl Check whether a recent-enough Guile-SSH is available.