From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Maxim Cournoyer Newsgroups: gmane.lisp.guile.devel 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 Message-ID: <20210305023524.15317-1-maxim.cournoyer@gmail.com> References: <8735xapc3x.fsf@gmail.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="30794"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Maxim Cournoyer To: guile-devel@gnu.org Original-X-From: guile-devel-bounces+guile-devel=m.gmane-mx.org@gnu.org Fri Mar 05 04:03:32 2021 Return-path: Envelope-to: guile-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lI0kV-0007uC-8f for guile-devel@m.gmane-mx.org; Fri, 05 Mar 2021 04:03:31 +0100 Original-Received: from localhost ([::1]:38594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lI0kU-0004cV-Av for guile-devel@m.gmane-mx.org; Thu, 04 Mar 2021 22:03:30 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:50008) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lI0Ju-0006n5-J9 for guile-devel@gnu.org; Thu, 04 Mar 2021 21:36:02 -0500 Original-Received: from mail-qk1-x72e.google.com ([2607:f8b0:4864:20::72e]:36148) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lI0Js-0007SZ-Uy for guile-devel@gnu.org; Thu, 04 Mar 2021 21:36:02 -0500 Original-Received: by mail-qk1-x72e.google.com with SMTP id n79so643289qke.3 for ; Thu, 04 Mar 2021 18:36:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gvBMHhiDSxLRnLLP/ZAtwuqKsrvDc6BTk78Fu78pe20=; b=bl7+CpFQ3qXWvR0/TLDcZY4RkWI8h56GxTKWkkxQ6NE05WC5B5CoL7qNtGFNGog1rA yjsSUU3l8OJ0r4a4FTzSXfMAzHCTeSCP78pfZyVSCa2FAkDxmjnAkXhvBtzrjuD1c9hr W9cNAbv+mrSA+f1PaRrDox5f3a5fxCYuI7YsnRjkzQWShigYxzBGsHhvnCC2vt088wv3 xfLxjQgy2+FDpIh6bJGIFyAqZ0FnCeumhmdKpxdlb+kzb5JtojE+73PRynsVtordkKEb JRZGwRZH5XjFnUiJkVVgT4yAOrowA7vTYaPGHSHsxpdBwUQ1YX6QMQbHxqrVrir8suId A2uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gvBMHhiDSxLRnLLP/ZAtwuqKsrvDc6BTk78Fu78pe20=; b=Mgf7aCUtvAI5H21zZvNC11AgceKQdlxSMl/rBkDY8IzdJzWeEoCFaq1VvaW1ytA+6d nE5qDnWHYaesL2BE7pZABe772IN9u/kgoqcvNgBjcv/WhfT273ZetiG8iayAzoIWc02e HfJs0F2ugt7kZiCRL1oNHWPV/SSXNu/Sg+xlJYUHLi+1D1SQt02ajkzrrnpob0b9ihSq GC2Wu3YWsMERLdi0tro0Bz8cewBAAuyen5y3oag51A7B49E+fNtTRBL4IyuMuhVnGCQz zOb/VWz+vrhCkgRLhKTG8RPunmzBqPOfzGcNs52Ofly79UQI6zHVGiwxYH63MRb8BpXa aWYQ== X-Gm-Message-State: AOAM533woYxUz8FHEeq7MDz+B4foQxphsAUMGBU16+vNyVidoYuEEc5F OiBw0xyVksJShN3U43ilhPFjQD9VuQ1YYg== X-Google-Smtp-Source: ABdhPJz95GlOsORBeBTBKC3ngFNW2OAPeLhpxaQyA/XzZI1wnBGtfuc626zdZdw/9N3lgM7L45ejVQ== X-Received: by 2002:a37:a44:: with SMTP id 65mr7003449qkk.479.1614911759721; Thu, 04 Mar 2021 18:35:59 -0800 (PST) Original-Received: from localhost.localdomain (dsl-10-132-106.b2b2c.ca. [72.10.132.106]) by smtp.gmail.com with ESMTPSA id a34sm1009349qtc.97.2021.03.04.18.35.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Mar 2021 18:35:59 -0800 (PST) X-Mailer: git-send-email 2.30.1 In-Reply-To: <8735xapc3x.fsf@gmail.com> Received-SPF: pass client-ip=2607:f8b0:4864:20::72e; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qk1-x72e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Thu, 04 Mar 2021 22:01:12 -0500 X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guile-devel-bounces+guile-devel=m.gmane-mx.org@gnu.org Original-Sender: "guile-devel" Xref: news.gmane.io gmane.lisp.guile.devel:20689 Archived-At: 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 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