Re: UPDATE: GNU make 4.4
On Sun, Nov 06, 2022 at 06:16:37PM -0500, Brad Smith wrote: > On Sun, Nov 06, 2022 at 12:28:58AM -0400, Brad Smith wrote: > > On Thu, Nov 03, 2022 at 11:20:05PM -0400, Brad Smith wrote: > > > On Thu, Nov 03, 2022 at 07:36:37PM -0400, Brad Smith wrote: > > > > On Thu, Nov 03, 2022 at 03:43:17PM -0400, Brad Smith wrote: > > > > > Here is an update to GNU make 4.4. > > > > > > > > > > Ran through a bulk by naddy@ on amd64. > > > > > > > > > > https://lists.gnu.org/archive/html/info-gnu/2022-10/msg8.html > > > > > > > > > > "There was one suspicious build failure: x11/lablgtk2 fails at the > > > > > fake > > > > > step with > > > > > ocamlfind: sourceView2Enums.ml: No such file or directory > > > > > > > > > > Other than that, no problems." > > > > > > > > Fix the date in the man page patch. > > > > > > Looks like this needs a tweak to build on non-Clang archs. > > > > With some assistance upstream provided a patch for the loadapi tests > > crashing. > > > > The output-sync test is an issue with the framework, and not an issue > > with make to worry about. It'll be fixed. > > Here are some additional patches to have the tests pass. > > But upstream had this to say.. > > "I'm not sure what the problem actually is here. It's something weird about > the > shell; it's doing something strange with SIGTERM. However I modified the > helper > app to be able to send TERM then replaced the test recipe "kill -TERM && > sleep" > with a reference to that." Here is an updated diff with the patches as commited upstream. Index: Makefile === RCS file: /home/cvs/ports/devel/gmake/Makefile,v retrieving revision 1.65 diff -u -p -u -p -r1.65 Makefile --- Makefile11 Mar 2022 18:50:08 - 1.65 +++ Makefile6 Nov 2022 22:43:14 - @@ -1,6 +1,6 @@ COMMENT= GNU make -DISTNAME= make-4.3 +DISTNAME= make-4.4 PKGNAME= g${DISTNAME} CATEGORIES=devel MASTER_SITES= ${MASTER_SITE_GNU:=make/} @@ -26,8 +26,12 @@ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/buil TEST_ENV= SHELL=$$SHELL -# Known test failures: -# output-sync can fail due to a race condition in the test itself -# https://lists.gnu.org/archive/html/bug-make/2020-01/msg00075.html +# Test suite will run .orig files +PATCHORIG= .~ + +.include +.if !${PROPERTIES:Mclang} +CFLAGS+= -std=gnu99 +.endif .include Index: distinfo === RCS file: /home/cvs/ports/devel/gmake/distinfo,v retrieving revision 1.10 diff -u -p -u -p -r1.10 distinfo --- distinfo1 Feb 2020 15:29:24 - 1.10 +++ distinfo31 Oct 2022 17:34:34 - @@ -1,2 +1,2 @@ -SHA256 (make-4.3.tar.lz) = 3hpEHE7flSUh2zC/yoC6roag/xrNCgBAKZk0TwTEXoI= -SIZE (make-4.3.tar.lz) = 1266180 +SHA256 (make-4.4.tar.lz) = SND8CyoEu1DykRwW2mVyMoX39IBMdPxaISSj32xfeMQ= +SIZE (make-4.4.tar.lz) = 1283355 Index: patches/patch-Makefile_in === RCS file: /home/cvs/ports/devel/gmake/patches/patch-Makefile_in,v retrieving revision 1.6 diff -u -p -u -p -r1.6 patch-Makefile_in --- patches/patch-Makefile_in 11 Mar 2022 18:50:08 - 1.6 +++ patches/patch-Makefile_in 31 Oct 2022 17:38:15 - @@ -1,12 +1,12 @@ Index: Makefile.in --- Makefile.in.orig +++ Makefile.in -@@ -1039,7 +1039,7 @@ make_SOURCES = $(make_SRCS) $(am__append_1) $(am__appe - $(am__append_4) $(am__append_5) - EXTRA_make_SOURCES = $(amiga_SRCS) $(vms_SRCS) - make_LDADD = $(LIBOBJS) $(GUILE_LIBS) lib/libgnu.a $(GETLOADAVG_LIBS) \ +@@ -564,7 +564,7 @@ EXTRA_make_SOURCES = $(amiga_SRCS) $(vms_SRCS) + @HAVE_GUILE_FALSE@_GUILE_LIBS = + @HAVE_GUILE_TRUE@_GUILE_LIBS = $(GUILE_LIBS) + make_LDADD = $(LIBOBJS) $(_GUILE_LIBS) lib/libgnu.a $(GETLOADAVG_LIBS) \ - @LIBINTL@ + @LTLIBINTL@ AM_CPPFLAGS = -Isrc -I$(top_srcdir)/src -Ilib -I$(top_srcdir)/lib \ - -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\" \ + -DLIBDIR=\"$(libdir)\" -DLOCALEDIR=\"$(localedir)\" \ Index: patches/patch-doc_make_1 === RCS file: /home/cvs/ports/devel/gmake/patches/patch-doc_make_1,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-doc_make_1 --- patches/patch-doc_make_111 Mar 2022 18:50:08 - 1.2 +++ patches/patch-doc_make_13 Nov 2022 23:33:07 - @@ -5,8 +5,8 @@ Index: doc/make.1 --- doc/make.1.orig +++ doc/make.1 @@ -1,13 +1,13 @@ --.TH MAKE 1 "28 February 2016" "GNU" "User Commands" -+.TH GMAKE 1 "28 February 2016" "GNU" "User Commands" +-.TH MAKE 1 "31 May 2022" "GNU" "User Commands" ++.TH GMAKE 1 "31 May 2022" "GNU" "User Commands" .SH NAME -make \- GNU make utility to maintain groups of programs +gmake \- GNU make utility to maintain groups of programs @@ -40,7 +40,7 @@ Index: doc/make.1 +.BR gmake , you must write a file called the .I makefile - that describes the
Re: UPDATE: GNU make 4.4
On Sun, Nov 06, 2022 at 12:28:58AM -0400, Brad Smith wrote: > On Thu, Nov 03, 2022 at 11:20:05PM -0400, Brad Smith wrote: > > On Thu, Nov 03, 2022 at 07:36:37PM -0400, Brad Smith wrote: > > > On Thu, Nov 03, 2022 at 03:43:17PM -0400, Brad Smith wrote: > > > > Here is an update to GNU make 4.4. > > > > > > > > Ran through a bulk by naddy@ on amd64. > > > > > > > > https://lists.gnu.org/archive/html/info-gnu/2022-10/msg8.html > > > > > > > > "There was one suspicious build failure: x11/lablgtk2 fails at the fake > > > > step with > > > > ocamlfind: sourceView2Enums.ml: No such file or directory > > > > > > > > Other than that, no problems." > > > > > > Fix the date in the man page patch. > > > > Looks like this needs a tweak to build on non-Clang archs. > > With some assistance upstream provided a patch for the loadapi tests > crashing. > > The output-sync test is an issue with the framework, and not an issue > with make to worry about. It'll be fixed. Here are some additional patches to have the tests pass. But upstream had this to say.. "I'm not sure what the problem actually is here. It's something weird about the shell; it's doing something strange with SIGTERM. However I modified the helper app to be able to send TERM then replaced the test recipe "kill -TERM && sleep" with a reference to that." Index: Makefile === RCS file: /home/cvs/ports/devel/gmake/Makefile,v retrieving revision 1.65 diff -u -p -u -p -r1.65 Makefile --- Makefile11 Mar 2022 18:50:08 - 1.65 +++ Makefile6 Nov 2022 22:43:14 - @@ -1,6 +1,6 @@ COMMENT= GNU make -DISTNAME= make-4.3 +DISTNAME= make-4.4 PKGNAME= g${DISTNAME} CATEGORIES=devel MASTER_SITES= ${MASTER_SITE_GNU:=make/} @@ -26,8 +26,12 @@ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/buil TEST_ENV= SHELL=$$SHELL -# Known test failures: -# output-sync can fail due to a race condition in the test itself -# https://lists.gnu.org/archive/html/bug-make/2020-01/msg00075.html +# Test suite will run .orig files +PATCHORIG= .~ + +.include +.if !${PROPERTIES:Mclang} +CFLAGS+= -std=gnu99 +.endif .include Index: distinfo === RCS file: /home/cvs/ports/devel/gmake/distinfo,v retrieving revision 1.10 diff -u -p -u -p -r1.10 distinfo --- distinfo1 Feb 2020 15:29:24 - 1.10 +++ distinfo31 Oct 2022 17:34:34 - @@ -1,2 +1,2 @@ -SHA256 (make-4.3.tar.lz) = 3hpEHE7flSUh2zC/yoC6roag/xrNCgBAKZk0TwTEXoI= -SIZE (make-4.3.tar.lz) = 1266180 +SHA256 (make-4.4.tar.lz) = SND8CyoEu1DykRwW2mVyMoX39IBMdPxaISSj32xfeMQ= +SIZE (make-4.4.tar.lz) = 1283355 Index: patches/patch-Makefile_in === RCS file: /home/cvs/ports/devel/gmake/patches/patch-Makefile_in,v retrieving revision 1.6 diff -u -p -u -p -r1.6 patch-Makefile_in --- patches/patch-Makefile_in 11 Mar 2022 18:50:08 - 1.6 +++ patches/patch-Makefile_in 31 Oct 2022 17:38:15 - @@ -1,12 +1,12 @@ Index: Makefile.in --- Makefile.in.orig +++ Makefile.in -@@ -1039,7 +1039,7 @@ make_SOURCES = $(make_SRCS) $(am__append_1) $(am__appe - $(am__append_4) $(am__append_5) - EXTRA_make_SOURCES = $(amiga_SRCS) $(vms_SRCS) - make_LDADD = $(LIBOBJS) $(GUILE_LIBS) lib/libgnu.a $(GETLOADAVG_LIBS) \ +@@ -564,7 +564,7 @@ EXTRA_make_SOURCES = $(amiga_SRCS) $(vms_SRCS) + @HAVE_GUILE_FALSE@_GUILE_LIBS = + @HAVE_GUILE_TRUE@_GUILE_LIBS = $(GUILE_LIBS) + make_LDADD = $(LIBOBJS) $(_GUILE_LIBS) lib/libgnu.a $(GETLOADAVG_LIBS) \ - @LIBINTL@ + @LTLIBINTL@ AM_CPPFLAGS = -Isrc -I$(top_srcdir)/src -Ilib -I$(top_srcdir)/lib \ - -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\" \ + -DLIBDIR=\"$(libdir)\" -DLOCALEDIR=\"$(localedir)\" \ Index: patches/patch-doc_make_1 === RCS file: /home/cvs/ports/devel/gmake/patches/patch-doc_make_1,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-doc_make_1 --- patches/patch-doc_make_111 Mar 2022 18:50:08 - 1.2 +++ patches/patch-doc_make_13 Nov 2022 23:33:07 - @@ -5,8 +5,8 @@ Index: doc/make.1 --- doc/make.1.orig +++ doc/make.1 @@ -1,13 +1,13 @@ --.TH MAKE 1 "28 February 2016" "GNU" "User Commands" -+.TH GMAKE 1 "28 February 2016" "GNU" "User Commands" +-.TH MAKE 1 "31 May 2022" "GNU" "User Commands" ++.TH GMAKE 1 "31 May 2022" "GNU" "User Commands" .SH NAME -make \- GNU make utility to maintain groups of programs +gmake \- GNU make utility to maintain groups of programs @@ -40,7 +40,7 @@ Index: doc/make.1 +.BR gmake , you must write a file called the .I makefile - that describes the relationships among files in your program, and the states + that describes the relationships among files in your program, and provides @@ -35,17 +35,17 @@ Once a suitable makefile exists, each time you change this
Re: UPDATE: GNU make 4.4
On Thu, Nov 03, 2022 at 11:20:05PM -0400, Brad Smith wrote: > On Thu, Nov 03, 2022 at 07:36:37PM -0400, Brad Smith wrote: > > On Thu, Nov 03, 2022 at 03:43:17PM -0400, Brad Smith wrote: > > > Here is an update to GNU make 4.4. > > > > > > Ran through a bulk by naddy@ on amd64. > > > > > > https://lists.gnu.org/archive/html/info-gnu/2022-10/msg8.html > > > > > > "There was one suspicious build failure: x11/lablgtk2 fails at the fake > > > step with > > > ocamlfind: sourceView2Enums.ml: No such file or directory > > > > > > Other than that, no problems." > > > > Fix the date in the man page patch. > > Looks like this needs a tweak to build on non-Clang archs. With some assistance upstream provided a patch for the loadapi tests crashing. The output-sync test is an issue with the framework, and not an issue with make to worry about. It'll be fixed. Index: Makefile === RCS file: /home/cvs/ports/devel/gmake/Makefile,v retrieving revision 1.65 diff -u -p -u -p -r1.65 Makefile --- Makefile11 Mar 2022 18:50:08 - 1.65 +++ Makefile4 Nov 2022 03:21:01 - @@ -1,6 +1,6 @@ COMMENT= GNU make -DISTNAME= make-4.3 +DISTNAME= make-4.4 PKGNAME= g${DISTNAME} CATEGORIES=devel MASTER_SITES= ${MASTER_SITE_GNU:=make/} @@ -25,6 +25,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build-aux TEST_ENV= SHELL=$$SHELL + +.include +.if !${PROPERTIES:Mclang} +CFLAGS+= -std=gnu99 +.endif # Known test failures: # output-sync can fail due to a race condition in the test itself Index: distinfo === RCS file: /home/cvs/ports/devel/gmake/distinfo,v retrieving revision 1.10 diff -u -p -u -p -r1.10 distinfo --- distinfo1 Feb 2020 15:29:24 - 1.10 +++ distinfo31 Oct 2022 17:34:34 - @@ -1,2 +1,2 @@ -SHA256 (make-4.3.tar.lz) = 3hpEHE7flSUh2zC/yoC6roag/xrNCgBAKZk0TwTEXoI= -SIZE (make-4.3.tar.lz) = 1266180 +SHA256 (make-4.4.tar.lz) = SND8CyoEu1DykRwW2mVyMoX39IBMdPxaISSj32xfeMQ= +SIZE (make-4.4.tar.lz) = 1283355 Index: patches/patch-Makefile_in === RCS file: /home/cvs/ports/devel/gmake/patches/patch-Makefile_in,v retrieving revision 1.6 diff -u -p -u -p -r1.6 patch-Makefile_in --- patches/patch-Makefile_in 11 Mar 2022 18:50:08 - 1.6 +++ patches/patch-Makefile_in 31 Oct 2022 17:38:15 - @@ -1,12 +1,12 @@ Index: Makefile.in --- Makefile.in.orig +++ Makefile.in -@@ -1039,7 +1039,7 @@ make_SOURCES = $(make_SRCS) $(am__append_1) $(am__appe - $(am__append_4) $(am__append_5) - EXTRA_make_SOURCES = $(amiga_SRCS) $(vms_SRCS) - make_LDADD = $(LIBOBJS) $(GUILE_LIBS) lib/libgnu.a $(GETLOADAVG_LIBS) \ +@@ -564,7 +564,7 @@ EXTRA_make_SOURCES = $(amiga_SRCS) $(vms_SRCS) + @HAVE_GUILE_FALSE@_GUILE_LIBS = + @HAVE_GUILE_TRUE@_GUILE_LIBS = $(GUILE_LIBS) + make_LDADD = $(LIBOBJS) $(_GUILE_LIBS) lib/libgnu.a $(GETLOADAVG_LIBS) \ - @LIBINTL@ + @LTLIBINTL@ AM_CPPFLAGS = -Isrc -I$(top_srcdir)/src -Ilib -I$(top_srcdir)/lib \ - -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\" \ + -DLIBDIR=\"$(libdir)\" -DLOCALEDIR=\"$(localedir)\" \ Index: patches/patch-doc_make_1 === RCS file: /home/cvs/ports/devel/gmake/patches/patch-doc_make_1,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-doc_make_1 --- patches/patch-doc_make_111 Mar 2022 18:50:08 - 1.2 +++ patches/patch-doc_make_13 Nov 2022 23:33:07 - @@ -5,8 +5,8 @@ Index: doc/make.1 --- doc/make.1.orig +++ doc/make.1 @@ -1,13 +1,13 @@ --.TH MAKE 1 "28 February 2016" "GNU" "User Commands" -+.TH GMAKE 1 "28 February 2016" "GNU" "User Commands" +-.TH MAKE 1 "31 May 2022" "GNU" "User Commands" ++.TH GMAKE 1 "31 May 2022" "GNU" "User Commands" .SH NAME -make \- GNU make utility to maintain groups of programs +gmake \- GNU make utility to maintain groups of programs @@ -40,7 +40,7 @@ Index: doc/make.1 +.BR gmake , you must write a file called the .I makefile - that describes the relationships among files in your program, and the states + that describes the relationships among files in your program, and provides @@ -35,17 +35,17 @@ Once a suitable makefile exists, each time you change this simple shell command: .sp 1 @@ -61,7 +61,7 @@ Index: doc/make.1 +.B gmake executes commands in the .I makefile - to update one or more target + to update one or more @@ -56,7 +56,7 @@ is typically a program. If no .B \-f @@ -98,7 +98,7 @@ Index: doc/make.1 decides what to do. .TP 0.5i .BI \-\-debug "[=FLAGS]" -@@ -172,7 +172,7 @@ If several +@@ -179,7 +179,7 @@ If several options are used to specify several directories, the directories are searched in the order specified. Unlike the arguments to other flags of @@ -107,7
Re: UPDATE: GNU make 4.4
Brad Smith: > Here is an update to GNU make 4.4. The included regression tests now show a number of failures. -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: UPDATE: GNU make 4.4
On Fri, Nov 04, 2022 at 01:48:30AM -0400, Brad Smith wrote: > On 11/3/2022 3:43 PM, Brad Smith wrote: > > Here is an update to GNU make 4.4. > > > > Ran through a bulk by naddy@ on amd64. > > > > https://lists.gnu.org/archive/html/info-gnu/2022-10/msg8.html > > > > "There was one suspicious build failure: x11/lablgtk2 fails at the fake > > step with > > ocamlfind: sourceView2Enums.ml: No such file or directory > > > > Other than that, no problems." > > Regarding the lablgtk2 issue. naddy@ mentioned he was seeing messages like > so > during the fake stage.. "warning: pattern recipe did not update peer target" > and the release notes mention.. * WARNING: Future backward-incompatibility! > In the NEXT release of GNU Make, pattern rules will implement the same > behavior change for multiple targets as explicit grouped targets, below: if > any target of the rule is needed by the build, the recipe will be invoked if > any target of the rule is missing or out of date. During testing some > makefiles were found to contain pattern rules that do not build all targets; > this can cause issues so we are delaying this change for one release cycle > to allow these makefiles to be updated. GNU Make shows a warning if it > detects this situation: "pattern recipe did not update peer target". Ugh. Didn't look like that when I hit send. Regarding the lablgtk2 issue. naddy@ mentioned he was seeing messages like so during the fake stage.. "warning: pattern recipe did not update peer target" and the release notes mention.. * WARNING: Future backward-incompatibility! In the NEXT release of GNU Make, pattern rules will implement the same behavior change for multiple targets as explicit grouped targets, below: if any target of the rule is needed by the build, the recipe will be invoked if any target of the rule is missing or out of date. During testing some makefiles were found to contain pattern rules that do not build all targets; this can cause issues so we are delaying this change for one release cycle to allow these makefiles to be updated. GNU Make shows a warning if it detects this situation: "pattern recipe did not update peer target".
Re: UPDATE: GNU make 4.4
On 11/3/2022 3:43 PM, Brad Smith wrote: Here is an update to GNU make 4.4. Ran through a bulk by naddy@ on amd64. https://lists.gnu.org/archive/html/info-gnu/2022-10/msg8.html "There was one suspicious build failure: x11/lablgtk2 fails at the fake step with ocamlfind: sourceView2Enums.ml: No such file or directory Other than that, no problems." Regarding the lablgtk2 issue. naddy@ mentioned he was seeing messages like so during the fake stage.. "warning: pattern recipe did not update peer target" and the release notes mention.. * WARNING: Future backward-incompatibility! In the NEXT release of GNU Make, pattern rules will implement the same behavior change for multiple targets as explicit grouped targets, below: if any target of the rule is needed by the build, the recipe will be invoked if any target of the rule is missing or out of date. During testing some makefiles were found to contain pattern rules that do not build all targets; this can cause issues so we are delaying this change for one release cycle to allow these makefiles to be updated. GNU Make shows a warning if it detects this situation: "pattern recipe did not update peer target".
Re: UPDATE: GNU make 4.4
On Thu, Nov 03, 2022 at 07:36:37PM -0400, Brad Smith wrote: > On Thu, Nov 03, 2022 at 03:43:17PM -0400, Brad Smith wrote: > > Here is an update to GNU make 4.4. > > > > Ran through a bulk by naddy@ on amd64. > > > > https://lists.gnu.org/archive/html/info-gnu/2022-10/msg8.html > > > > "There was one suspicious build failure: x11/lablgtk2 fails at the fake > > step with > > ocamlfind: sourceView2Enums.ml: No such file or directory > > > > Other than that, no problems." > > Fix the date in the man page patch. Looks like this needs a tweak to build on non-Clang archs. Index: Makefile === RCS file: /home/cvs/ports/devel/gmake/Makefile,v retrieving revision 1.65 diff -u -p -u -p -r1.65 Makefile --- Makefile11 Mar 2022 18:50:08 - 1.65 +++ Makefile4 Nov 2022 03:17:06 - @@ -1,6 +1,6 @@ COMMENT= GNU make -DISTNAME= make-4.3 +DISTNAME= make-4.4 PKGNAME= g${DISTNAME} CATEGORIES=devel MASTER_SITES= ${MASTER_SITE_GNU:=make/} @@ -25,6 +25,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build-aux TEST_ENV= SHELL=$$SHELL + +.include +.if !${PROPERTIES:Mclang} +CFLAGS+= -std=gnu99 +.endif # Known test failures: # output-sync can fail due to a race condition in the test itself Index: distinfo === RCS file: /home/cvs/ports/devel/gmake/distinfo,v retrieving revision 1.10 diff -u -p -u -p -r1.10 distinfo --- distinfo1 Feb 2020 15:29:24 - 1.10 +++ distinfo31 Oct 2022 17:34:34 - @@ -1,2 +1,2 @@ -SHA256 (make-4.3.tar.lz) = 3hpEHE7flSUh2zC/yoC6roag/xrNCgBAKZk0TwTEXoI= -SIZE (make-4.3.tar.lz) = 1266180 +SHA256 (make-4.4.tar.lz) = SND8CyoEu1DykRwW2mVyMoX39IBMdPxaISSj32xfeMQ= +SIZE (make-4.4.tar.lz) = 1283355 Index: patches/patch-Makefile_in === RCS file: /home/cvs/ports/devel/gmake/patches/patch-Makefile_in,v retrieving revision 1.6 diff -u -p -u -p -r1.6 patch-Makefile_in --- patches/patch-Makefile_in 11 Mar 2022 18:50:08 - 1.6 +++ patches/patch-Makefile_in 31 Oct 2022 17:38:15 - @@ -1,12 +1,12 @@ Index: Makefile.in --- Makefile.in.orig +++ Makefile.in -@@ -1039,7 +1039,7 @@ make_SOURCES = $(make_SRCS) $(am__append_1) $(am__appe - $(am__append_4) $(am__append_5) - EXTRA_make_SOURCES = $(amiga_SRCS) $(vms_SRCS) - make_LDADD = $(LIBOBJS) $(GUILE_LIBS) lib/libgnu.a $(GETLOADAVG_LIBS) \ +@@ -564,7 +564,7 @@ EXTRA_make_SOURCES = $(amiga_SRCS) $(vms_SRCS) + @HAVE_GUILE_FALSE@_GUILE_LIBS = + @HAVE_GUILE_TRUE@_GUILE_LIBS = $(GUILE_LIBS) + make_LDADD = $(LIBOBJS) $(_GUILE_LIBS) lib/libgnu.a $(GETLOADAVG_LIBS) \ - @LIBINTL@ + @LTLIBINTL@ AM_CPPFLAGS = -Isrc -I$(top_srcdir)/src -Ilib -I$(top_srcdir)/lib \ - -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\" \ + -DLIBDIR=\"$(libdir)\" -DLOCALEDIR=\"$(localedir)\" \ Index: patches/patch-doc_make_1 === RCS file: /home/cvs/ports/devel/gmake/patches/patch-doc_make_1,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-doc_make_1 --- patches/patch-doc_make_111 Mar 2022 18:50:08 - 1.2 +++ patches/patch-doc_make_13 Nov 2022 23:33:07 - @@ -5,8 +5,8 @@ Index: doc/make.1 --- doc/make.1.orig +++ doc/make.1 @@ -1,13 +1,13 @@ --.TH MAKE 1 "28 February 2016" "GNU" "User Commands" -+.TH GMAKE 1 "28 February 2016" "GNU" "User Commands" +-.TH MAKE 1 "31 May 2022" "GNU" "User Commands" ++.TH GMAKE 1 "31 May 2022" "GNU" "User Commands" .SH NAME -make \- GNU make utility to maintain groups of programs +gmake \- GNU make utility to maintain groups of programs @@ -40,7 +40,7 @@ Index: doc/make.1 +.BR gmake , you must write a file called the .I makefile - that describes the relationships among files in your program, and the states + that describes the relationships among files in your program, and provides @@ -35,17 +35,17 @@ Once a suitable makefile exists, each time you change this simple shell command: .sp 1 @@ -61,7 +61,7 @@ Index: doc/make.1 +.B gmake executes commands in the .I makefile - to update one or more target + to update one or more @@ -56,7 +56,7 @@ is typically a program. If no .B \-f @@ -98,7 +98,7 @@ Index: doc/make.1 decides what to do. .TP 0.5i .BI \-\-debug "[=FLAGS]" -@@ -172,7 +172,7 @@ If several +@@ -179,7 +179,7 @@ If several options are used to specify several directories, the directories are searched in the order specified. Unlike the arguments to other flags of @@ -107,7 +107,7 @@ Index: doc/make.1 directories given with .B \-I flags may come directly after the flag: -@@ -195,7 +195,7 @@ option, the last one is effective. +@@ -202,7 +202,7 @@ option, the last one is effective. If the .B \-j option is given without an argument, @@ -115,8
Re: UPDATE: GNU make 4.4
On Thu, Nov 03, 2022 at 09:48:30PM +, v...@ljabl.com wrote: > > === > > RCS file: /home/cvs/ports/devel/gmake/patches/patch-doc_make_1,v > > retrieving revision 1.2 > > diff -u -p -u -p -r1.2 patch-doc_make_1 > > --- patches/patch-doc_make_111 Mar 2022 18:50:08 - 1.2 > > +++ patches/patch-doc_make_131 Oct 2022 17:38:12 - > > @@ -5,7 +5,7 @@ Index: doc/make.1 > > --- doc/make.1.orig > > +++ doc/make.1 > > @@ -1,13 +1,13 @@ > > --.TH MAKE 1 "28 February 2016" "GNU" "User Commands" > > +-.TH MAKE 1 "31 May 2022" "GNU" "User Commands" > > +.TH GMAKE 1 "28 February 2016" "GNU" "User Commands" > > .SH NAME > > The replacement date is not updated. Thanks.
Re: UPDATE: GNU make 4.4
On Thu, Nov 03, 2022 at 03:43:17PM -0400, Brad Smith wrote: > Here is an update to GNU make 4.4. > > Ran through a bulk by naddy@ on amd64. > > https://lists.gnu.org/archive/html/info-gnu/2022-10/msg8.html > > "There was one suspicious build failure: x11/lablgtk2 fails at the fake > step with > ocamlfind: sourceView2Enums.ml: No such file or directory > > Other than that, no problems." Fix the date in the man page patch. Index: Makefile === RCS file: /home/cvs/ports/devel/gmake/Makefile,v retrieving revision 1.65 diff -u -p -u -p -r1.65 Makefile --- Makefile11 Mar 2022 18:50:08 - 1.65 +++ Makefile31 Oct 2022 17:34:26 - @@ -1,6 +1,6 @@ COMMENT= GNU make -DISTNAME= make-4.3 +DISTNAME= make-4.4 PKGNAME= g${DISTNAME} CATEGORIES=devel MASTER_SITES= ${MASTER_SITE_GNU:=make/} Index: distinfo === RCS file: /home/cvs/ports/devel/gmake/distinfo,v retrieving revision 1.10 diff -u -p -u -p -r1.10 distinfo --- distinfo1 Feb 2020 15:29:24 - 1.10 +++ distinfo31 Oct 2022 17:34:34 - @@ -1,2 +1,2 @@ -SHA256 (make-4.3.tar.lz) = 3hpEHE7flSUh2zC/yoC6roag/xrNCgBAKZk0TwTEXoI= -SIZE (make-4.3.tar.lz) = 1266180 +SHA256 (make-4.4.tar.lz) = SND8CyoEu1DykRwW2mVyMoX39IBMdPxaISSj32xfeMQ= +SIZE (make-4.4.tar.lz) = 1283355 Index: patches/patch-Makefile_in === RCS file: /home/cvs/ports/devel/gmake/patches/patch-Makefile_in,v retrieving revision 1.6 diff -u -p -u -p -r1.6 patch-Makefile_in --- patches/patch-Makefile_in 11 Mar 2022 18:50:08 - 1.6 +++ patches/patch-Makefile_in 31 Oct 2022 17:38:15 - @@ -1,12 +1,12 @@ Index: Makefile.in --- Makefile.in.orig +++ Makefile.in -@@ -1039,7 +1039,7 @@ make_SOURCES = $(make_SRCS) $(am__append_1) $(am__appe - $(am__append_4) $(am__append_5) - EXTRA_make_SOURCES = $(amiga_SRCS) $(vms_SRCS) - make_LDADD = $(LIBOBJS) $(GUILE_LIBS) lib/libgnu.a $(GETLOADAVG_LIBS) \ +@@ -564,7 +564,7 @@ EXTRA_make_SOURCES = $(amiga_SRCS) $(vms_SRCS) + @HAVE_GUILE_FALSE@_GUILE_LIBS = + @HAVE_GUILE_TRUE@_GUILE_LIBS = $(GUILE_LIBS) + make_LDADD = $(LIBOBJS) $(_GUILE_LIBS) lib/libgnu.a $(GETLOADAVG_LIBS) \ - @LIBINTL@ + @LTLIBINTL@ AM_CPPFLAGS = -Isrc -I$(top_srcdir)/src -Ilib -I$(top_srcdir)/lib \ - -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\" \ + -DLIBDIR=\"$(libdir)\" -DLOCALEDIR=\"$(localedir)\" \ Index: patches/patch-doc_make_1 === RCS file: /home/cvs/ports/devel/gmake/patches/patch-doc_make_1,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-doc_make_1 --- patches/patch-doc_make_111 Mar 2022 18:50:08 - 1.2 +++ patches/patch-doc_make_13 Nov 2022 23:33:07 - @@ -5,8 +5,8 @@ Index: doc/make.1 --- doc/make.1.orig +++ doc/make.1 @@ -1,13 +1,13 @@ --.TH MAKE 1 "28 February 2016" "GNU" "User Commands" -+.TH GMAKE 1 "28 February 2016" "GNU" "User Commands" +-.TH MAKE 1 "31 May 2022" "GNU" "User Commands" ++.TH GMAKE 1 "31 May 2022" "GNU" "User Commands" .SH NAME -make \- GNU make utility to maintain groups of programs +gmake \- GNU make utility to maintain groups of programs @@ -40,7 +40,7 @@ Index: doc/make.1 +.BR gmake , you must write a file called the .I makefile - that describes the relationships among files in your program, and the states + that describes the relationships among files in your program, and provides @@ -35,17 +35,17 @@ Once a suitable makefile exists, each time you change this simple shell command: .sp 1 @@ -61,7 +61,7 @@ Index: doc/make.1 +.B gmake executes commands in the .I makefile - to update one or more target + to update one or more @@ -56,7 +56,7 @@ is typically a program. If no .B \-f @@ -98,7 +98,7 @@ Index: doc/make.1 decides what to do. .TP 0.5i .BI \-\-debug "[=FLAGS]" -@@ -172,7 +172,7 @@ If several +@@ -179,7 +179,7 @@ If several options are used to specify several directories, the directories are searched in the order specified. Unlike the arguments to other flags of @@ -107,7 +107,7 @@ Index: doc/make.1 directories given with .B \-I flags may come directly after the flag: -@@ -195,7 +195,7 @@ option, the last one is effective. +@@ -202,7 +202,7 @@ option, the last one is effective. If the .B \-j option is given without an argument, @@ -115,8 +115,8 @@ Index: doc/make.1 +.BR gmake will not limit the number of jobs that can run simultaneously. .TP 0.5i - \fB\-k\fR, \fB\-\-keep\-going\fR -@@ -256,7 +256,7 @@ This also prints the version information given by the + \fB\--jobserver-style=\fR\fIstyle\fR +@@ -273,7 +273,7 @@ This also prints the version information given by the .B \-v switch (see below). To print the data base without trying to remake any files, use @@ -125,7 +125,7 @@ Index:
Re: UPDATE: GNU make 4.4
=== RCS file: /home/cvs/ports/devel/gmake/patches/patch-doc_make_1,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-doc_make_1 --- patches/patch-doc_make_111 Mar 2022 18:50:08 - 1.2 +++ patches/patch-doc_make_131 Oct 2022 17:38:12 - @@ -5,7 +5,7 @@ Index: doc/make.1 --- doc/make.1.orig +++ doc/make.1 @@ -1,13 +1,13 @@ --.TH MAKE 1 "28 February 2016" "GNU" "User Commands" +-.TH MAKE 1 "31 May 2022" "GNU" "User Commands" +.TH GMAKE 1 "28 February 2016" "GNU" "User Commands" .SH NAME The replacement date is not updated.
UPDATE: GNU make 4.4
Here is an update to GNU make 4.4. Ran through a bulk by naddy@ on amd64. https://lists.gnu.org/archive/html/info-gnu/2022-10/msg8.html "There was one suspicious build failure: x11/lablgtk2 fails at the fake step with ocamlfind: sourceView2Enums.ml: No such file or directory Other than that, no problems." Index: Makefile === RCS file: /home/cvs/ports/devel/gmake/Makefile,v retrieving revision 1.65 diff -u -p -u -p -r1.65 Makefile --- Makefile11 Mar 2022 18:50:08 - 1.65 +++ Makefile31 Oct 2022 17:34:26 - @@ -1,6 +1,6 @@ COMMENT= GNU make -DISTNAME= make-4.3 +DISTNAME= make-4.4 PKGNAME= g${DISTNAME} CATEGORIES=devel MASTER_SITES= ${MASTER_SITE_GNU:=make/} Index: distinfo === RCS file: /home/cvs/ports/devel/gmake/distinfo,v retrieving revision 1.10 diff -u -p -u -p -r1.10 distinfo --- distinfo1 Feb 2020 15:29:24 - 1.10 +++ distinfo31 Oct 2022 17:34:34 - @@ -1,2 +1,2 @@ -SHA256 (make-4.3.tar.lz) = 3hpEHE7flSUh2zC/yoC6roag/xrNCgBAKZk0TwTEXoI= -SIZE (make-4.3.tar.lz) = 1266180 +SHA256 (make-4.4.tar.lz) = SND8CyoEu1DykRwW2mVyMoX39IBMdPxaISSj32xfeMQ= +SIZE (make-4.4.tar.lz) = 1283355 Index: patches/patch-Makefile_in === RCS file: /home/cvs/ports/devel/gmake/patches/patch-Makefile_in,v retrieving revision 1.6 diff -u -p -u -p -r1.6 patch-Makefile_in --- patches/patch-Makefile_in 11 Mar 2022 18:50:08 - 1.6 +++ patches/patch-Makefile_in 31 Oct 2022 17:38:15 - @@ -1,12 +1,12 @@ Index: Makefile.in --- Makefile.in.orig +++ Makefile.in -@@ -1039,7 +1039,7 @@ make_SOURCES = $(make_SRCS) $(am__append_1) $(am__appe - $(am__append_4) $(am__append_5) - EXTRA_make_SOURCES = $(amiga_SRCS) $(vms_SRCS) - make_LDADD = $(LIBOBJS) $(GUILE_LIBS) lib/libgnu.a $(GETLOADAVG_LIBS) \ +@@ -564,7 +564,7 @@ EXTRA_make_SOURCES = $(amiga_SRCS) $(vms_SRCS) + @HAVE_GUILE_FALSE@_GUILE_LIBS = + @HAVE_GUILE_TRUE@_GUILE_LIBS = $(GUILE_LIBS) + make_LDADD = $(LIBOBJS) $(_GUILE_LIBS) lib/libgnu.a $(GETLOADAVG_LIBS) \ - @LIBINTL@ + @LTLIBINTL@ AM_CPPFLAGS = -Isrc -I$(top_srcdir)/src -Ilib -I$(top_srcdir)/lib \ - -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\" \ + -DLIBDIR=\"$(libdir)\" -DLOCALEDIR=\"$(localedir)\" \ Index: patches/patch-doc_make_1 === RCS file: /home/cvs/ports/devel/gmake/patches/patch-doc_make_1,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-doc_make_1 --- patches/patch-doc_make_111 Mar 2022 18:50:08 - 1.2 +++ patches/patch-doc_make_131 Oct 2022 17:38:12 - @@ -5,7 +5,7 @@ Index: doc/make.1 --- doc/make.1.orig +++ doc/make.1 @@ -1,13 +1,13 @@ --.TH MAKE 1 "28 February 2016" "GNU" "User Commands" +-.TH MAKE 1 "31 May 2022" "GNU" "User Commands" +.TH GMAKE 1 "28 February 2016" "GNU" "User Commands" .SH NAME -make \- GNU make utility to maintain groups of programs @@ -40,7 +40,7 @@ Index: doc/make.1 +.BR gmake , you must write a file called the .I makefile - that describes the relationships among files in your program, and the states + that describes the relationships among files in your program, and provides @@ -35,17 +35,17 @@ Once a suitable makefile exists, each time you change this simple shell command: .sp 1 @@ -61,7 +61,7 @@ Index: doc/make.1 +.B gmake executes commands in the .I makefile - to update one or more target + to update one or more @@ -56,7 +56,7 @@ is typically a program. If no .B \-f @@ -98,7 +98,7 @@ Index: doc/make.1 decides what to do. .TP 0.5i .BI \-\-debug "[=FLAGS]" -@@ -172,7 +172,7 @@ If several +@@ -179,7 +179,7 @@ If several options are used to specify several directories, the directories are searched in the order specified. Unlike the arguments to other flags of @@ -107,7 +107,7 @@ Index: doc/make.1 directories given with .B \-I flags may come directly after the flag: -@@ -195,7 +195,7 @@ option, the last one is effective. +@@ -202,7 +202,7 @@ option, the last one is effective. If the .B \-j option is given without an argument, @@ -115,8 +115,8 @@ Index: doc/make.1 +.BR gmake will not limit the number of jobs that can run simultaneously. .TP 0.5i - \fB\-k\fR, \fB\-\-keep\-going\fR -@@ -256,7 +256,7 @@ This also prints the version information given by the + \fB\--jobserver-style=\fR\fIstyle\fR +@@ -273,7 +273,7 @@ This also prints the version information given by the .B \-v switch (see below). To print the data base without trying to remake any files, use @@ -125,7 +125,7 @@ Index: doc/make.1 .TP 0.5i \fB\-q\fR, \fB\-\-question\fR ``Question mode''. -@@ -287,7 +287,7 @@ Touch files (mark them up to date without really chang +@@ -304,7 +304,7 @@ Touch files (mark them up to date without really chang