From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: guile-devel@gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [PATCH devel 1/6] Revert "When using guile-3.0, compile src/md5.scm using -O0"
Date: Thu, 4 Mar 2021 21:35:19 -0500 [thread overview]
Message-ID: <20210305023524.15317-1-maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <8735xapc3x.fsf@gmail.com>
This reverts commit 437ddcdd359ce7daccd546be0060fb71c56a71d7. I'm
proposing to add the fix from Guix, which is simpler.
---
am/guile.mk | 12 +-----------
configure.ac | 4 +---
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/am/guile.mk b/am/guile.mk
index 0cc75a7..6ab0750 100644
--- a/am/guile.mk
+++ b/am/guile.mk
@@ -27,7 +27,7 @@
moddir=@SITEDIR@
godir=@SITECCACHEDIR@
-major=@GUILE_MAJOR_VERSION@
+
GOBJECTS = $(SOURCES:%.scm=%.go)
@@ -45,16 +45,6 @@ $(guile_install_go_files): install-nobase_modDATA
GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat
SUFFIXES = .scm .go
-
.scm.go:
$(AM_V_GEN)$(top_builddir)/pre-inst-env \
$(GUILD) compile $(GUILE_WARNINGS) -o "$@" "$<"
-
-md5.go : md5.scm
- $(AM_V_GEN)if [ "$(major)" -eq "3" ]; then \
- $(top_builddir)/pre-inst-env \
- $(GUILD) compile $(GUILE_WARNINGS) -O0 -o "$@" "$<"; \
- else \
- $(top_builddir)/pre-inst-env \
- $(GUILD) compile $(GUILE_WARNINGS) -o "$@" "$<"; \
- fi
diff --git a/configure.ac b/configure.ac
index 3547035..07be121 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl
define(GUILE_LIB_CONFIGURE_COPYRIGHT,[[
-Copyright (C) 2016 - 2018, 2020 David Pirotte
+Copyright (C) 2016 - 2018 David Pirotte
David Pirotte <david at altosw dot be>
This file is part of Guile-Lib.
@@ -92,8 +92,6 @@ fi
AC_SUBST([SITEDIR])
AC_SUBST([SITECCACHEDIR])
-GUILE_MAJOR_VERSION=`$GUILE -c '(display (major-version))'`
-AC_SUBST(GUILE_MAJOR_VERSION)
AC_CONFIG_FILES(
[pre-inst-env],
--
2.30.1
next prev parent reply other threads:[~2021-03-05 2:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-05 2:14 [PATCH devel 0/6] Parameterize the parent constraints in htmlprag & varia Maxim Cournoyer
2021-03-05 2:35 ` Maxim Cournoyer [this message]
2021-03-05 2:35 ` [PATCH devel 2/6] Work around Guile 3.0.0 miscompilation at -O2 Maxim Cournoyer
2021-03-05 2:35 ` [PATCH devel 3/6] Add a HACK file Maxim Cournoyer
2021-03-05 2:35 ` [PATCH devel 4/6] htmlprag: Allow users to parameterize the parent constraints Maxim Cournoyer
2021-03-05 2:35 ` [PATCH devel 5/6] build: Add support for cross-compilation Maxim Cournoyer
2021-03-05 2:35 ` [PATCH devel 6/6] configure.ac: Standardize default installation directory Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/guile/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210305023524.15317-1-maxim.cournoyer@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=guile-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).