gawk-diffs
[Top][All Lists]
Advanced

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

[SCM] gawk branch, gawk-5.1-stable, updated. gawk-4.1.0-4237-g2cc075b


From: Eli Zaretskii
Subject: [SCM] gawk branch, gawk-5.1-stable, updated. gawk-4.1.0-4237-g2cc075b
Date: Sun, 9 May 2021 05:24:12 -0400 (EDT)

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, gawk-5.1-stable has been updated
       via  2cc075b59f843485510d00ce4ffb3654d5a908e8 (commit)
      from  8303fcb4ac651568dff831da88c147bbebea3ba7 (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=2cc075b59f843485510d00ce4ffb3654d5a908e8

commit 2cc075b59f843485510d00ce4ffb3654d5a908e8
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sun May 9 12:23:26 2021 +0300

    Fix the MinGW build.

diff --git a/pc/ChangeLog b/pc/ChangeLog
index 37821c6..10327b1 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,12 @@
+2021-05-09  Eli Zaretskii  <eliz@gnu.org>
+
+       * Makefile (VPATH): Adapt to addition of support/malloc
+       directory.
+       (DYNOBJS): New list with dependencies of new files in
+       support/malloc.
+       (LIBOBJS): Add DYNOBJS.
+       (regex$O): Depend on some files in support/malloc.
+
 2021-05-05         Arnold D. Robbins     <arnold@skeeve.com>
 
        * Makefile.tst: Rebuilt.
diff --git a/pc/Makefile b/pc/Makefile
index beafd3d..b2ca315 100644
--- a/pc/Makefile
+++ b/pc/Makefile
@@ -101,7 +101,7 @@ DO_LNK = $($(LNK))
 DO_BIND= $($(BIND))
 #------------------------------------------------------------------------
 # To allow Make find files in the support subdirectory.
-VPATH = .;./support
+VPATH = .;./support;./support/malloc
 #========================================================================
 # End of general configuration. Some platform-specific configuration
 # notes appear below.
@@ -241,7 +241,8 @@ ALLOBJS = $(AWKOBJS) awkgram$O getid$O $(OBJ)
 
 # LIBOBJS
 #       GNU and other stuff that gawk uses as library routines.
-LIBOBJS= getopt$O getopt1$O dfa$O regex$O random$O localeinfo$O
+DYNOBJS= dynarray_resize$O dynarray_emplace_enlarge$O dynarray_finalize$O
+LIBOBJS= getopt$O getopt1$O dfa$O random$O localeinfo$O regex$O $(DYNOBJS)
 
 GAWKOBJS = $(ALLOBJS) $(LIBOBJS)
 
@@ -271,9 +272,11 @@ $(RSPFILE) : $(GAWKOBJS)
 #    and we have -I. on the compiler command line.  unistd.h is
 #    included by awk.h.
 # 2. custom.h is not mentioned because pc ports don't use it.
-$(ALLOBJS) $(LIBOBJS): \
+$(ALLOBJS) $(LIBOBJS) $(DYNOBJS): \
   awk.h regex.h config.h gettext.h mbsupport.h protos.h dfa.h getopt.h 
nonposix.h
 
+$(DYNOBJS) regex$O:    dynarray.h libc-config.h malloc/dynarray.h 
malloc/dynarray-skeleton.c
+
 builtin$O:     floatmagic.h random.h popen.h
 
 random$O:      random.h

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

Summary of changes:
 pc/ChangeLog | 9 +++++++++
 pc/Makefile  | 9 ++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
gawk



reply via email to

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