Package: automake-patches;
Reported by: "Jose E. Marchesi" <jemarch <at> gnu.org>
Date: Thu, 24 Apr 2025 11:37:07 UTC
Severity: normal
Tags: patch
Done: Karl Berry <karl <at> freefriends.org>
To reply to this bug, email your comments to 78033 AT debbugs.gnu.org.
There is no need to reopen the bug first.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
automake-patches <at> gnu.org:bug#78033; Package automake-patches.
(Thu, 24 Apr 2025 11:37:09 GMT) Full text and rfc822 format available."Jose E. Marchesi" <jemarch <at> gnu.org>:automake-patches <at> gnu.org.
(Thu, 24 Apr 2025 11:37:10 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: "Jose E. Marchesi" <jemarch <at> gnu.org> To: automake-patches <at> gnu.org Subject: [PATCH] algol68: rename A68 to A68C and AM_PROG_A68 to AM_PROG_A68C Date: Thu, 24 Apr 2025 13:36:23 +0200
While upstreaming the Algol 68 autoconf support it was pointed out that the
shell variable A68 shall be renamed to A68C and that the macro AC_PROG_A68
shall be renamed to AC_PROG_A68C. This is to be more consistent to the
support for other languages like Go. This patch updates the Automake side.
The Algol 68 code snippets are also updated to use modern stropping, which is
the stropping regime now used by default by ga68.
---
bin/automake.in | 16 ++++++++--------
doc/automake.texi | 6 +++---
lib/Automake/Variable.pm | 4 ++--
t/a68-demo.sh | 6 +++---
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/bin/automake.in b/bin/automake.in
index bb60a6355..dd6fb183b 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -1024,18 +1024,18 @@ register_language ('name' => 'java',
# Algol 68 in GCC
register_language ('name' => 'a68',
'Name' => 'Algol 68',
- 'config_vars' => ['A68'],
+ 'config_vars' => ['A68C'],
'linker' => 'A68LINK',
'link' => '$(A68LD) $(AM_A68FLAGS) $(A68FLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@',
'flags' => ['A68FLAGS'],
- 'compile' => '$(A68) $(AM_A68FLAGS) $(A68FLAGS)',
- 'ccer' => 'A68',
+ 'compile' => '$(A68C) $(AM_A68FLAGS) $(A68FLAGS)',
+ 'ccer' => 'A68C',
'compiler' => 'A68COMPILE',
'compile_flag' => '-c',
'output_flag' => '-o',
- 'libtool_tag' => 'A68',
+ 'libtool_tag' => 'A68C',
'lder' => 'A68LD',
- 'ld' => '$(A68)',
+ 'ld' => '$(A68C)',
'pure' => 1,
'extensions' => ['.a68']);
@@ -5581,7 +5581,7 @@ EOF
{
# Hardcode the tags supported by Libtool 1.5.
%libtool_tags = (CC => 1, CXX => 1, GCJ => 1, F77 => 1,
- A68 => 1);
+ A68C => 1);
}
}
}
@@ -6201,12 +6201,12 @@ my %_am_macro_for_cond =
(
AMDEP => "one of the compiler tests\n"
. " AC_PROG_CC, AC_PROG_CXX, AC_PROG_OBJC, AC_PROG_OBJCXX,\n"
- . " AM_PROG_AS, AM_PROG_GCJ, AM_PROG_UPC, AM_PROG_A68",
+ . " AM_PROG_AS, AM_PROG_GCJ, AM_PROG_UPC, AM_PROG_A68C",
am__fastdepCC => 'AC_PROG_CC',
am__fastdepCCAS => 'AM_PROG_AS',
am__fastdepCXX => 'AC_PROG_CXX',
am__fastdepGCJ => 'AM_PROG_GCJ',
- am__fastdepA68 => 'AM_PROG_A68',
+ am__fastdepA68 => 'AM_PROG_A68C',
am__fastdepOBJC => 'AC_PROG_OBJC',
am__fastdepOBJCXX => 'AC_PROG_OBJCXX',
am__fastdepUPC => 'AM_PROG_UPC'
diff --git a/doc/automake.texi b/doc/automake.texi
index 9b0f27e14..a94f72d74 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -7189,15 +7189,15 @@ source file.
Automake includes support for Algol 68, using GCC.
Any package including Algol 68 code must define the output variable
-@code{A68} in @file{configure.ac}; the simplest way to do this is to use
-the @code{AC_PROG_A68} macro (@pxref{Particular Programs, , Particular
+@code{A68C} in @file{configure.ac}; the simplest way to do this is to use
+the @code{AC_PROG_A68C} macro (@pxref{Particular Programs, , Particular
Program Checks, autoconf, The Autoconf Manual}).
A few additional variables are defined when an Algol 68 source file is
seen:
@vtable @code
-@item A68
+@item A68C
The name of the Algol 68 compiler.
@item A68FLAGS
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index d454ff755..bb1d4c983 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -180,8 +180,8 @@ my %_ac_macro_for_var =
CXX => 'AC_PROG_CXX',
CXXFLAGS => 'AC_PROG_CXX',
F77 => 'AC_PROG_F77',
- A68 => 'AC_PROG_A68',
- A68FLAGS => 'AC_PROG_A68',
+ A68 => 'AC_PROG_A68C',
+ A68FLAGS => 'AC_PROG_A68C',
FFLAGS => 'AC_PROG_F77',
FC => 'AC_PROG_FC',
FCFLAGS => 'AC_PROG_FC',
diff --git a/t/a68-demo.sh b/t/a68-demo.sh
index ac07dff2e..a69d2328b 100644
--- a/t/a68-demo.sh
+++ b/t/a68-demo.sh
@@ -25,7 +25,7 @@ AC_INIT([GNU Algol 68 Demo], [1.0], [bug-automake <at> gnu.org])
AC_CONFIG_SRCDIR([play.a68])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE
-AC_PROG_A68
+AC_PROG_A68C
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
END
@@ -51,11 +51,11 @@ $AUTOCONF
$AUTOMAKE --add-missing
cat > work.a68 << 'END'
-PROGRAM (puts ("We are working :-(\n"); 0)
+(puts ("We are working :-('n"))
END
cat > play.a68 << 'END'
-PROGRAM (puts ("We are playing :-)\n"); 0)
+(puts ("We are playing :-)'n"))
END
./configure
--
2.30.2
automake-patches <at> gnu.org:bug#78033; Package automake-patches.
(Thu, 24 Apr 2025 22:10:02 GMT) Full text and rfc822 format available.Message #8 received at 78033 <at> debbugs.gnu.org (full text, mbox):
From: Karl Berry <karl <at> freefriends.org> To: jemarch <at> gnu.org Cc: 78033 <at> debbugs.gnu.org Subject: Re: [bug#78033] [PATCH] algol68: rename A68 to A68C and AM_PROG_A68 to AM_PROG_A68C Date: Thu, 24 Apr 2025 16:09:06 -0600
algol68: rename A68 to A68C and AM_PROG_A68 to AM_PROG_A68C
Installed as written (modulo some tiny wording in the changelog entry).
Thanks Jose. -k
automake: algol68: rename A68 to A68C and AM_PROG_A68 to AM_PROG_A68C.
From https://bugs.gnu.org/78033 (automake-patches).
While upstreaming the Algol 68 autoconf support it was pointed
out that the shell variable A68 should be renamed to A68C and
that the macro AC_PROG_A68 should be renamed to AC_PROG_A68C.
This is to be more consistent to the support for other languages
like Go. This patch updates the Automake side.
The Algol 68 code snippets are also updated to use modern
stropping, which is the stropping regime now used by default by ga68.
* bin/automake.in (a68): change config_vars, libtool_tags et al.
* lib/Automake/Variable.pm: likewise rename.
* doc/automake.texi: likewise rename.
* t/a68-demo.sh: likewise modify.
diff --git a/bin/automake.in b/bin/automake.in
index bb60a6355..dd6fb183b 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -1024,18 +1024,18 @@ register_language ('name' => 'java',
# Algol 68 in GCC
register_language ('name' => 'a68',
'Name' => 'Algol 68',
- 'config_vars' => ['A68'],
+ 'config_vars' => ['A68C'],
'linker' => 'A68LINK',
'link' => '$(A68LD) $(AM_A68FLAGS) $(A68FLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@',
'flags' => ['A68FLAGS'],
- 'compile' => '$(A68) $(AM_A68FLAGS) $(A68FLAGS)',
- 'ccer' => 'A68',
+ 'compile' => '$(A68C) $(AM_A68FLAGS) $(A68FLAGS)',
+ 'ccer' => 'A68C',
'compiler' => 'A68COMPILE',
'compile_flag' => '-c',
'output_flag' => '-o',
- 'libtool_tag' => 'A68',
+ 'libtool_tag' => 'A68C',
'lder' => 'A68LD',
- 'ld' => '$(A68)',
+ 'ld' => '$(A68C)',
'pure' => 1,
'extensions' => ['.a68']);
@@ -5581,7 +5581,7 @@ EOF
{
# Hardcode the tags supported by Libtool 1.5.
%libtool_tags = (CC => 1, CXX => 1, GCJ => 1, F77 => 1,
- A68 => 1);
+ A68C => 1);
}
}
}
@@ -6201,12 +6201,12 @@ my %_am_macro_for_cond =
(
AMDEP => "one of the compiler tests\n"
. " AC_PROG_CC, AC_PROG_CXX, AC_PROG_OBJC, AC_PROG_OBJCXX,\n"
- . " AM_PROG_AS, AM_PROG_GCJ, AM_PROG_UPC, AM_PROG_A68",
+ . " AM_PROG_AS, AM_PROG_GCJ, AM_PROG_UPC, AM_PROG_A68C",
am__fastdepCC => 'AC_PROG_CC',
am__fastdepCCAS => 'AM_PROG_AS',
am__fastdepCXX => 'AC_PROG_CXX',
am__fastdepGCJ => 'AM_PROG_GCJ',
- am__fastdepA68 => 'AM_PROG_A68',
+ am__fastdepA68 => 'AM_PROG_A68C',
am__fastdepOBJC => 'AC_PROG_OBJC',
am__fastdepOBJCXX => 'AC_PROG_OBJCXX',
am__fastdepUPC => 'AM_PROG_UPC'
diff --git a/doc/automake.texi b/doc/automake.texi
index 9b0f27e14..a94f72d74 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -7189,15 +7189,15 @@ source file.
Automake includes support for Algol 68, using GCC.
Any package including Algol 68 code must define the output variable
-@code{A68} in @file{configure.ac}; the simplest way to do this is to use
-the @code{AC_PROG_A68} macro (@pxref{Particular Programs, , Particular
+@code{A68C} in @file{configure.ac}; the simplest way to do this is to use
+the @code{AC_PROG_A68C} macro (@pxref{Particular Programs, , Particular
Program Checks, autoconf, The Autoconf Manual}).
A few additional variables are defined when an Algol 68 source file is
seen:
@vtable @code
-@item A68
+@item A68C
The name of the Algol 68 compiler.
@item A68FLAGS
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index d454ff755..bb1d4c983 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -180,8 +180,8 @@ my %_ac_macro_for_var =
CXX => 'AC_PROG_CXX',
CXXFLAGS => 'AC_PROG_CXX',
F77 => 'AC_PROG_F77',
- A68 => 'AC_PROG_A68',
- A68FLAGS => 'AC_PROG_A68',
+ A68 => 'AC_PROG_A68C',
+ A68FLAGS => 'AC_PROG_A68C',
FFLAGS => 'AC_PROG_F77',
FC => 'AC_PROG_FC',
FCFLAGS => 'AC_PROG_FC',
diff --git a/t/a68-demo.sh b/t/a68-demo.sh
index ac07dff2e..a69d2328b 100644
--- a/t/a68-demo.sh
+++ b/t/a68-demo.sh
@@ -25,7 +25,7 @@ AC_INIT([GNU Algol 68 Demo], [1.0], [bug-automake <at> gnu.org])
AC_CONFIG_SRCDIR([play.a68])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE
-AC_PROG_A68
+AC_PROG_A68C
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
END
@@ -51,11 +51,11 @@ $AUTOCONF
$AUTOMAKE --add-missing
cat > work.a68 << 'END'
-PROGRAM (puts ("We are working :-(\n"); 0)
+(puts ("We are working :-('n"))
END
cat > play.a68 << 'END'
-PROGRAM (puts ("We are playing :-)\n"); 0)
+(puts ("We are playing :-)'n"))
END
./configure
Karl Berry <karl <at> freefriends.org>:"Jose E. Marchesi" <jemarch <at> gnu.org>:automake-patches <at> gnu.org:bug#78033; Package automake-patches.
(Fri, 25 Apr 2025 01:08:01 GMT) Full text and rfc822 format available.Message #16 received at 78033 <at> debbugs.gnu.org (full text, mbox):
From: Nick Bowler <nbowler <at> draconx.ca> To: "Jose E. Marchesi" <jemarch <at> gnu.org> Cc: 78033 <at> debbugs.gnu.org Subject: Re: [bug#78033] [PATCH] algol68: rename A68 to A68C and AM_PROG_A68 to AM_PROG_A68C Date: Thu, 24 Apr 2025 21:07:43 -0400
On Thu, Apr 24, 2025 at 01:36:23PM +0200, Jose E. Marchesi wrote:
> While upstreaming the Algol 68 autoconf support it was pointed out that the
> shell variable A68 shall be renamed to A68C and that the macro AC_PROG_A68
> shall be renamed to AC_PROG_A68C. This is to be more consistent to the
> support for other languages like Go. This patch updates the Automake side.
[...]
> --- a/bin/automake.in
> +++ b/bin/automake.in
> @@ -1024,18 +1024,18 @@ register_language ('name' => 'java',
> # Algol 68 in GCC
> register_language ('name' => 'a68',
> 'Name' => 'Algol 68',
> - 'config_vars' => ['A68'],
> + 'config_vars' => ['A68C'],
> 'linker' => 'A68LINK',
> 'link' => '$(A68LD) $(AM_A68FLAGS) $(A68FLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@',
> 'flags' => ['A68FLAGS'],
> - 'compile' => '$(A68) $(AM_A68FLAGS) $(A68FLAGS)',
> - 'ccer' => 'A68',
> + 'compile' => '$(A68C) $(AM_A68FLAGS) $(A68FLAGS)',
> + 'ccer' => 'A68C',
If the command variable name is being renamed to A68C then we should
also rename the flags variable to A68CFLAGS as per the GNU coding
standards.
Cheers,
Nick
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.