guile-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH devel 1/6] Revert "When using guile-3.0, compile src/md5.scm usin


From: Maxim Cournoyer
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

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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]