gawk-diffs
[Top][All Lists]
Advanced

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

[SCM] gawk branch, feature/minrx, updated. gawk-4.1.0-5569-g828e0e31


From: Arnold Robbins
Subject: [SCM] gawk branch, feature/minrx, updated. gawk-4.1.0-5569-g828e0e31
Date: Thu, 29 Feb 2024 11:05:28 -0500 (EST)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, feature/minrx has been updated
       via  828e0e31f46b405e0a62a512238a5263cd025d67 (commit)
      from  6184bf7e2833a42d9057722d919cf62b17b7935a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=828e0e31f46b405e0a62a512238a5263cd025d67

commit 828e0e31f46b405e0a62a512238a5263cd025d67
Author: Arnold D. Robbins <arnold@skeeve.com>
Date:   Thu Feb 29 18:04:57 2024 +0200

    Make build complete all the way, ensure C++17 for minrx.

diff --git a/Makefile.am b/Makefile.am
index 9f5e40c6..d8ae9f53 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,8 @@ ACLOCAL_AMFLAGS = -I m4
 AM_CFLAGS = @CFLAGS@
 AM_LDFLAGS = @LDFLAGS@
 
+CCLD = g++     # temporary, until minrx is rewritten in C
+
 # Stuff to include in the dist that doesn't need it's own
 # Makefile.am files
 EXTRA_DIST = \
diff --git a/Makefile.in b/Makefile.in
index a8fd98b0..ec105448 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -223,7 +223,6 @@ AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC      " $@;
 am__v_CC_1 = 
-CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
@@ -483,6 +482,7 @@ top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I m4
 AM_CFLAGS = @CFLAGS@
 AM_LDFLAGS = @LDFLAGS@
+CCLD = g++     # temporary, until minrx is rewritten in C
 
 # Stuff to include in the dist that doesn't need it's own
 # Makefile.am files
diff --git a/configure b/configure
index b0b6d947..d2f053ba 100755
--- a/configure
+++ b/configure
@@ -7876,6 +7876,13 @@ fi
 
 
 
+if test -f $srcdir/support/minrx.h && test -f $srcdir/support/minrx.cpp
+then
+       CXXFLAGS='-std=c++17'
+fi
+
+
+
 # shared library suffix for dynamic loading:
 
 
diff --git a/configure.ac b/configure.ac
index 355560eb..da52ae95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,6 +147,13 @@ fi
 
 AC_SUBST(CFLAGS)
 
+if test -f $srcdir/support/minrx.h && test -f $srcdir/support/minrx.cpp
+then
+       CXXFLAGS='-std=c++17'
+fi
+
+AC_SUBST(CXXFLAGS)
+
 # shared library suffix for dynamic loading:
 AC_SUBST(acl_shlibext)
 
diff --git a/extension/Makefile.am b/extension/Makefile.am
index 0427d2da..0f5abcc2 100644
--- a/extension/Makefile.am
+++ b/extension/Makefile.am
@@ -26,6 +26,8 @@
 
 AM_CPPFLAGS = -I$(srcdir)/..
 
+AM_CXXFLAGS = @CXXFLAGS@
+
 # This variable insures that aclocal runs
 # correctly after changing configure.ac
 ACLOCAL_AMFLAGS = -I ../m4
diff --git a/extension/Makefile.in b/extension/Makefile.in
index ce490c98..e2933d1b 100644
--- a/extension/Makefile.in
+++ b/extension/Makefile.in
@@ -555,6 +555,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(srcdir)/..
+AM_CXXFLAGS = @CXXFLAGS@
 
 # This variable insures that aclocal runs
 # correctly after changing configure.ac

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am           | 2 ++
 Makefile.in           | 2 +-
 configure             | 7 +++++++
 configure.ac          | 7 +++++++
 extension/Makefile.am | 2 ++
 extension/Makefile.in | 1 +
 6 files changed, 20 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
gawk



reply via email to

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