* [PR PATCH] make: update to 4.4.1.
@ 2023-07-16 11:54 motorto
2023-07-16 11:56 ` [PR PATCH] [Updated] " motorto
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: motorto @ 2023-07-16 11:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 715 bytes --]
There is a new pull request by motorto against master on the void-packages repository
https://github.com/motorto/void-packages make-4.4.1
https://github.com/void-linux/void-packages/pull/45059
make: update to 4.4.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**, more testers welcomed
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (cross)
- aarch64 (cross)
A patch file from https://github.com/void-linux/void-packages/pull/45059.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-make-4.4.1-45059.patch --]
[-- Type: text/x-diff, Size: 7997 bytes --]
From e2198f2b37a1b48302a69fbac54de543a19aa238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Jul 2023 12:47:07 +0100
Subject: [PATCH] make: update to 4.4.1.
---
.../make/patches/regression-openjdk9.patch | 207 ------------------
srcpkgs/make/template | 4 +-
2 files changed, 2 insertions(+), 209 deletions(-)
delete mode 100644 srcpkgs/make/patches/regression-openjdk9.patch
diff --git a/srcpkgs/make/patches/regression-openjdk9.patch b/srcpkgs/make/patches/regression-openjdk9.patch
deleted file mode 100644
index 52e5d336ce66..000000000000
--- a/srcpkgs/make/patches/regression-openjdk9.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-From 9c29c1b082fd59b57f3c15b17900ca1da0db8ad1 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 18 Apr 2020 19:57:44 +0200
-Subject: [PATCH] Revert "[SV 40236] Handle included file open failures
- properly."
-
-This reverts commit c5ccc4930c3805604813def4455bc2e90635349e.
-
-This commit breaks build of openjdk9 at very least.
----
- src/main.c | 25 +++++++++-----------
- src/read.c | 42 +++++++++++++++++++---------------
- tests/scripts/features/include | 23 -------------------
- 3 files changed, 34 insertions(+), 56 deletions(-)
-
-diff --git a/src/main.c b/src/main.c
-index bcba2d1..6c892a8 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -2180,7 +2180,8 @@ main (int argc, char **argv, char **envp)
- {
- /* Update any makefiles if necessary. */
-
-- FILE_TIMESTAMP *makefile_mtimes;
-+ FILE_TIMESTAMP *makefile_mtimes = 0;
-+ unsigned int mm_idx = 0;
- char **aargv = NULL;
- const char **nargv;
- int nargc;
-@@ -2188,22 +2189,12 @@ main (int argc, char **argv, char **envp)
-
- DB (DB_BASIC, (_("Updating makefiles....\n")));
-
-- {
-- struct goaldep *d;
-- unsigned int num_mkfiles = 0;
-- for (d = read_files; d != NULL; d = d->next)
-- ++num_mkfiles;
--
-- makefile_mtimes = alloca (num_mkfiles * sizeof (FILE_TIMESTAMP));
-- }
--
- /* Remove any makefiles we don't want to try to update. Record the
- current modtimes of the others so we can compare them later. */
- {
-- struct goaldep *d = read_files;
-- struct goaldep *last = NULL;
-- unsigned int mm_idx = 0;
--
-+ register struct goaldep *d, *last;
-+ last = 0;
-+ d = read_files;
- while (d != 0)
- {
- struct file *f;
-@@ -2237,6 +2228,9 @@ main (int argc, char **argv, char **envp)
- }
- else
- {
-+ makefile_mtimes = xrealloc (makefile_mtimes,
-+ (mm_idx+1)
-+ * sizeof (FILE_TIMESTAMP));
- makefile_mtimes[mm_idx++] = file_mtime_no_search (d->file);
- last = d;
- d = d->next;
-@@ -2496,6 +2490,9 @@ main (int argc, char **argv, char **envp)
- free (aargv);
- break;
- }
-+
-+ /* Free the makefile mtimes. */
-+ free (makefile_mtimes);
- }
-
- /* Set up 'MAKEFLAGS' again for the normal targets. */
-diff --git a/src/read.c b/src/read.c
-index db52a55..39b5885 100644
---- a/src/read.c
-+++ b/src/read.c
-@@ -321,11 +321,7 @@ eval_makefile (const char *filename, unsigned short flags)
- struct ebuffer ebuf;
- const floc *curfile;
- char *expanded = 0;
--
-- /* Create a new goaldep entry. */
-- deps = alloc_goaldep ();
-- deps->next = read_files;
-- read_files = deps;
-+ int makefile_errno;
-
- ebuf.floc.filenm = filename; /* Use the original file name. */
- ebuf.floc.lineno = 1;
-@@ -356,12 +352,13 @@ eval_makefile (const char *filename, unsigned short flags)
- filename = expanded;
- }
-
-- errno = 0;
- ENULLLOOP (ebuf.fp, fopen (filename, "r"));
-- deps->error = errno;
-+
-+ /* Save the error code so we print the right message later. */
-+ makefile_errno = errno;
-
- /* Check for unrecoverable errors: out of mem or FILE slots. */
-- switch (deps->error)
-+ switch (makefile_errno)
- {
- #ifdef EMFILE
- case EMFILE:
-@@ -371,7 +368,7 @@ eval_makefile (const char *filename, unsigned short flags)
- #endif
- case ENOMEM:
- {
-- const char *err = strerror (deps->error);
-+ const char *err = strerror (makefile_errno);
- OS (fatal, reading_file, "%s", err);
- }
- }
-@@ -395,8 +392,14 @@ eval_makefile (const char *filename, unsigned short flags)
- }
- }
-
-- /* Enter the final name for this makefile as a goaldep. */
-+ /* Now we have the final name for this makefile. Enter it into
-+ the cache. */
- filename = strcache_add (filename);
-+
-+ /* Add FILENAME to the chain of read makefiles. */
-+ deps = alloc_goaldep ();
-+ deps->next = read_files;
-+ read_files = deps;
- deps->file = lookup_file (filename);
- if (deps->file == 0)
- deps->file = enter_file (filename);
-@@ -405,19 +408,17 @@ eval_makefile (const char *filename, unsigned short flags)
-
- free (expanded);
-
-+ /* If the makefile can't be found at all, give up entirely. */
-+
- if (ebuf.fp == 0)
- {
-- /* The makefile can't be read at all, give up entirely.
-- If we did some searching errno has the error from the last attempt,
-- rather from FILENAME itself: recover the more accurate one. */
-- errno = deps->error;
-- deps->file->last_mtime = NONEXISTENT_MTIME;
-+ /* If we did some searching, errno has the error from the last
-+ attempt, rather from FILENAME itself. Store it in case the
-+ caller wants to use it in a message. */
-+ errno = makefile_errno;
- return deps;
- }
-
-- /* Success; clear errno. */
-- deps->error = 0;
--
- /* Avoid leaking the makefile to children. */
- fd_noinherit (fileno (ebuf.fp));
-
-@@ -908,7 +909,10 @@ eval (struct ebuffer *ebuf, int set_default)
- struct goaldep *d = eval_makefile (files->name, flags);
-
- if (errno)
-- d->floc = *fstart;
-+ {
-+ d->error = (unsigned short)errno;
-+ d->floc = *fstart;
-+ }
-
- free_ns (files);
- files = next;
-diff --git a/tests/scripts/features/include b/tests/scripts/features/include
-index 0c63c06..67f8e65 100644
---- a/tests/scripts/features/include
-+++ b/tests/scripts/features/include
-@@ -237,27 +237,4 @@ inc1: foo; echo > $@
- rmfiles('inc1');
- }
-
--# Including files that can't be read should show an error
--if (defined $ERR_unreadable_file) {
-- create_file('inc1', 'FOO := foo');
-- chmod 0000, 'inc1';
--
-- run_make_test(q!
--include inc1
--all:;@echo $(FOO)
--!,
-- '', "#MAKEFILE#:2: inc1: $ERR_unreadable_file\n#MAKE#: *** No rule to make target 'inc1'. Stop.", 512);
--
--# Unreadable files that we know how to successfully recreate should work
--
-- run_make_test(sprintf(q!
--all:;@echo $(FOO)
--include inc1
--inc1:; @%s $@ && echo FOO := bar > $@
--!, $CMD_rmfile),
-- '', "bar");
--
-- rmfiles('inc1');
--}
--
- 1;
---
-2.26.1
-
diff --git a/srcpkgs/make/template b/srcpkgs/make/template
index 9a980aa10dde..0b970db71797 100644
--- a/srcpkgs/make/template
+++ b/srcpkgs/make/template
@@ -1,6 +1,6 @@
# Template file for 'make'
pkgname=make
-version=4.3
+version=4.4.1
revision=3
bootstrap=yes
build_style=gnu-configure
@@ -13,5 +13,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/make"
distfiles="${GNU_SITE}/make/${pkgname}-${version}.tar.lz"
-checksum=de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82
+checksum=8814ba072182b605d156d7589c19a43b89fc58ea479b9355146160946f8cf6e9
build_options=guile
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] make: update to 4.4.1.
2023-07-16 11:54 [PR PATCH] make: update to 4.4.1 motorto
@ 2023-07-16 11:56 ` motorto
2023-07-16 11:59 ` motorto
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: motorto @ 2023-07-16 11:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 720 bytes --]
There is an updated pull request by motorto against master on the void-packages repository
https://github.com/motorto/void-packages make-4.4.1
https://github.com/void-linux/void-packages/pull/45059
make: update to 4.4.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**, more testers welcomed
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (cross)
- aarch64 (cross)
A patch file from https://github.com/void-linux/void-packages/pull/45059.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-make-4.4.1-45059.patch --]
[-- Type: text/x-diff, Size: 8046 bytes --]
From 7388128377653b65c2677681c9f62d8e34b0e9a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Jul 2023 12:47:07 +0100
Subject: [PATCH] make: update to 4.4.1.
---
.../make/patches/regression-openjdk9.patch | 207 ------------------
srcpkgs/make/template | 6 +-
2 files changed, 3 insertions(+), 210 deletions(-)
delete mode 100644 srcpkgs/make/patches/regression-openjdk9.patch
diff --git a/srcpkgs/make/patches/regression-openjdk9.patch b/srcpkgs/make/patches/regression-openjdk9.patch
deleted file mode 100644
index 52e5d336ce66..000000000000
--- a/srcpkgs/make/patches/regression-openjdk9.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-From 9c29c1b082fd59b57f3c15b17900ca1da0db8ad1 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 18 Apr 2020 19:57:44 +0200
-Subject: [PATCH] Revert "[SV 40236] Handle included file open failures
- properly."
-
-This reverts commit c5ccc4930c3805604813def4455bc2e90635349e.
-
-This commit breaks build of openjdk9 at very least.
----
- src/main.c | 25 +++++++++-----------
- src/read.c | 42 +++++++++++++++++++---------------
- tests/scripts/features/include | 23 -------------------
- 3 files changed, 34 insertions(+), 56 deletions(-)
-
-diff --git a/src/main.c b/src/main.c
-index bcba2d1..6c892a8 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -2180,7 +2180,8 @@ main (int argc, char **argv, char **envp)
- {
- /* Update any makefiles if necessary. */
-
-- FILE_TIMESTAMP *makefile_mtimes;
-+ FILE_TIMESTAMP *makefile_mtimes = 0;
-+ unsigned int mm_idx = 0;
- char **aargv = NULL;
- const char **nargv;
- int nargc;
-@@ -2188,22 +2189,12 @@ main (int argc, char **argv, char **envp)
-
- DB (DB_BASIC, (_("Updating makefiles....\n")));
-
-- {
-- struct goaldep *d;
-- unsigned int num_mkfiles = 0;
-- for (d = read_files; d != NULL; d = d->next)
-- ++num_mkfiles;
--
-- makefile_mtimes = alloca (num_mkfiles * sizeof (FILE_TIMESTAMP));
-- }
--
- /* Remove any makefiles we don't want to try to update. Record the
- current modtimes of the others so we can compare them later. */
- {
-- struct goaldep *d = read_files;
-- struct goaldep *last = NULL;
-- unsigned int mm_idx = 0;
--
-+ register struct goaldep *d, *last;
-+ last = 0;
-+ d = read_files;
- while (d != 0)
- {
- struct file *f;
-@@ -2237,6 +2228,9 @@ main (int argc, char **argv, char **envp)
- }
- else
- {
-+ makefile_mtimes = xrealloc (makefile_mtimes,
-+ (mm_idx+1)
-+ * sizeof (FILE_TIMESTAMP));
- makefile_mtimes[mm_idx++] = file_mtime_no_search (d->file);
- last = d;
- d = d->next;
-@@ -2496,6 +2490,9 @@ main (int argc, char **argv, char **envp)
- free (aargv);
- break;
- }
-+
-+ /* Free the makefile mtimes. */
-+ free (makefile_mtimes);
- }
-
- /* Set up 'MAKEFLAGS' again for the normal targets. */
-diff --git a/src/read.c b/src/read.c
-index db52a55..39b5885 100644
---- a/src/read.c
-+++ b/src/read.c
-@@ -321,11 +321,7 @@ eval_makefile (const char *filename, unsigned short flags)
- struct ebuffer ebuf;
- const floc *curfile;
- char *expanded = 0;
--
-- /* Create a new goaldep entry. */
-- deps = alloc_goaldep ();
-- deps->next = read_files;
-- read_files = deps;
-+ int makefile_errno;
-
- ebuf.floc.filenm = filename; /* Use the original file name. */
- ebuf.floc.lineno = 1;
-@@ -356,12 +352,13 @@ eval_makefile (const char *filename, unsigned short flags)
- filename = expanded;
- }
-
-- errno = 0;
- ENULLLOOP (ebuf.fp, fopen (filename, "r"));
-- deps->error = errno;
-+
-+ /* Save the error code so we print the right message later. */
-+ makefile_errno = errno;
-
- /* Check for unrecoverable errors: out of mem or FILE slots. */
-- switch (deps->error)
-+ switch (makefile_errno)
- {
- #ifdef EMFILE
- case EMFILE:
-@@ -371,7 +368,7 @@ eval_makefile (const char *filename, unsigned short flags)
- #endif
- case ENOMEM:
- {
-- const char *err = strerror (deps->error);
-+ const char *err = strerror (makefile_errno);
- OS (fatal, reading_file, "%s", err);
- }
- }
-@@ -395,8 +392,14 @@ eval_makefile (const char *filename, unsigned short flags)
- }
- }
-
-- /* Enter the final name for this makefile as a goaldep. */
-+ /* Now we have the final name for this makefile. Enter it into
-+ the cache. */
- filename = strcache_add (filename);
-+
-+ /* Add FILENAME to the chain of read makefiles. */
-+ deps = alloc_goaldep ();
-+ deps->next = read_files;
-+ read_files = deps;
- deps->file = lookup_file (filename);
- if (deps->file == 0)
- deps->file = enter_file (filename);
-@@ -405,19 +408,17 @@ eval_makefile (const char *filename, unsigned short flags)
-
- free (expanded);
-
-+ /* If the makefile can't be found at all, give up entirely. */
-+
- if (ebuf.fp == 0)
- {
-- /* The makefile can't be read at all, give up entirely.
-- If we did some searching errno has the error from the last attempt,
-- rather from FILENAME itself: recover the more accurate one. */
-- errno = deps->error;
-- deps->file->last_mtime = NONEXISTENT_MTIME;
-+ /* If we did some searching, errno has the error from the last
-+ attempt, rather from FILENAME itself. Store it in case the
-+ caller wants to use it in a message. */
-+ errno = makefile_errno;
- return deps;
- }
-
-- /* Success; clear errno. */
-- deps->error = 0;
--
- /* Avoid leaking the makefile to children. */
- fd_noinherit (fileno (ebuf.fp));
-
-@@ -908,7 +909,10 @@ eval (struct ebuffer *ebuf, int set_default)
- struct goaldep *d = eval_makefile (files->name, flags);
-
- if (errno)
-- d->floc = *fstart;
-+ {
-+ d->error = (unsigned short)errno;
-+ d->floc = *fstart;
-+ }
-
- free_ns (files);
- files = next;
-diff --git a/tests/scripts/features/include b/tests/scripts/features/include
-index 0c63c06..67f8e65 100644
---- a/tests/scripts/features/include
-+++ b/tests/scripts/features/include
-@@ -237,27 +237,4 @@ inc1: foo; echo > $@
- rmfiles('inc1');
- }
-
--# Including files that can't be read should show an error
--if (defined $ERR_unreadable_file) {
-- create_file('inc1', 'FOO := foo');
-- chmod 0000, 'inc1';
--
-- run_make_test(q!
--include inc1
--all:;@echo $(FOO)
--!,
-- '', "#MAKEFILE#:2: inc1: $ERR_unreadable_file\n#MAKE#: *** No rule to make target 'inc1'. Stop.", 512);
--
--# Unreadable files that we know how to successfully recreate should work
--
-- run_make_test(sprintf(q!
--all:;@echo $(FOO)
--include inc1
--inc1:; @%s $@ && echo FOO := bar > $@
--!, $CMD_rmfile),
-- '', "bar");
--
-- rmfiles('inc1');
--}
--
- 1;
---
-2.26.1
-
diff --git a/srcpkgs/make/template b/srcpkgs/make/template
index 9a980aa10dde..4d7169e3b104 100644
--- a/srcpkgs/make/template
+++ b/srcpkgs/make/template
@@ -1,7 +1,7 @@
# Template file for 'make'
pkgname=make
-version=4.3
-revision=3
+version=4.4.1
+revision=1
bootstrap=yes
build_style=gnu-configure
configure_args="$(vopt_with guile)"
@@ -13,5 +13,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/make"
distfiles="${GNU_SITE}/make/${pkgname}-${version}.tar.lz"
-checksum=de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82
+checksum=8814ba072182b605d156d7589c19a43b89fc58ea479b9355146160946f8cf6e9
build_options=guile
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] make: update to 4.4.1.
2023-07-16 11:54 [PR PATCH] make: update to 4.4.1 motorto
2023-07-16 11:56 ` [PR PATCH] [Updated] " motorto
@ 2023-07-16 11:59 ` motorto
2023-07-16 12:04 ` motorto
2023-07-24 20:49 ` [PR PATCH] [Merged]: " Duncaen
3 siblings, 0 replies; 6+ messages in thread
From: motorto @ 2023-07-16 11:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 720 bytes --]
There is an updated pull request by motorto against master on the void-packages repository
https://github.com/motorto/void-packages make-4.4.1
https://github.com/void-linux/void-packages/pull/45059
make: update to 4.4.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**, more testers welcomed
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (cross)
- aarch64 (cross)
A patch file from https://github.com/void-linux/void-packages/pull/45059.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-make-4.4.1-45059.patch --]
[-- Type: text/x-diff, Size: 8213 bytes --]
From 307664a3a98b0304706d9451beb58d5bb290bd6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Jul 2023 12:47:07 +0100
Subject: [PATCH] make: update to 4.4.1.
---
.../make/patches/regression-openjdk9.patch | 207 ------------------
srcpkgs/make/template | 8 +-
2 files changed, 4 insertions(+), 211 deletions(-)
delete mode 100644 srcpkgs/make/patches/regression-openjdk9.patch
diff --git a/srcpkgs/make/patches/regression-openjdk9.patch b/srcpkgs/make/patches/regression-openjdk9.patch
deleted file mode 100644
index 52e5d336ce66..000000000000
--- a/srcpkgs/make/patches/regression-openjdk9.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-From 9c29c1b082fd59b57f3c15b17900ca1da0db8ad1 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 18 Apr 2020 19:57:44 +0200
-Subject: [PATCH] Revert "[SV 40236] Handle included file open failures
- properly."
-
-This reverts commit c5ccc4930c3805604813def4455bc2e90635349e.
-
-This commit breaks build of openjdk9 at very least.
----
- src/main.c | 25 +++++++++-----------
- src/read.c | 42 +++++++++++++++++++---------------
- tests/scripts/features/include | 23 -------------------
- 3 files changed, 34 insertions(+), 56 deletions(-)
-
-diff --git a/src/main.c b/src/main.c
-index bcba2d1..6c892a8 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -2180,7 +2180,8 @@ main (int argc, char **argv, char **envp)
- {
- /* Update any makefiles if necessary. */
-
-- FILE_TIMESTAMP *makefile_mtimes;
-+ FILE_TIMESTAMP *makefile_mtimes = 0;
-+ unsigned int mm_idx = 0;
- char **aargv = NULL;
- const char **nargv;
- int nargc;
-@@ -2188,22 +2189,12 @@ main (int argc, char **argv, char **envp)
-
- DB (DB_BASIC, (_("Updating makefiles....\n")));
-
-- {
-- struct goaldep *d;
-- unsigned int num_mkfiles = 0;
-- for (d = read_files; d != NULL; d = d->next)
-- ++num_mkfiles;
--
-- makefile_mtimes = alloca (num_mkfiles * sizeof (FILE_TIMESTAMP));
-- }
--
- /* Remove any makefiles we don't want to try to update. Record the
- current modtimes of the others so we can compare them later. */
- {
-- struct goaldep *d = read_files;
-- struct goaldep *last = NULL;
-- unsigned int mm_idx = 0;
--
-+ register struct goaldep *d, *last;
-+ last = 0;
-+ d = read_files;
- while (d != 0)
- {
- struct file *f;
-@@ -2237,6 +2228,9 @@ main (int argc, char **argv, char **envp)
- }
- else
- {
-+ makefile_mtimes = xrealloc (makefile_mtimes,
-+ (mm_idx+1)
-+ * sizeof (FILE_TIMESTAMP));
- makefile_mtimes[mm_idx++] = file_mtime_no_search (d->file);
- last = d;
- d = d->next;
-@@ -2496,6 +2490,9 @@ main (int argc, char **argv, char **envp)
- free (aargv);
- break;
- }
-+
-+ /* Free the makefile mtimes. */
-+ free (makefile_mtimes);
- }
-
- /* Set up 'MAKEFLAGS' again for the normal targets. */
-diff --git a/src/read.c b/src/read.c
-index db52a55..39b5885 100644
---- a/src/read.c
-+++ b/src/read.c
-@@ -321,11 +321,7 @@ eval_makefile (const char *filename, unsigned short flags)
- struct ebuffer ebuf;
- const floc *curfile;
- char *expanded = 0;
--
-- /* Create a new goaldep entry. */
-- deps = alloc_goaldep ();
-- deps->next = read_files;
-- read_files = deps;
-+ int makefile_errno;
-
- ebuf.floc.filenm = filename; /* Use the original file name. */
- ebuf.floc.lineno = 1;
-@@ -356,12 +352,13 @@ eval_makefile (const char *filename, unsigned short flags)
- filename = expanded;
- }
-
-- errno = 0;
- ENULLLOOP (ebuf.fp, fopen (filename, "r"));
-- deps->error = errno;
-+
-+ /* Save the error code so we print the right message later. */
-+ makefile_errno = errno;
-
- /* Check for unrecoverable errors: out of mem or FILE slots. */
-- switch (deps->error)
-+ switch (makefile_errno)
- {
- #ifdef EMFILE
- case EMFILE:
-@@ -371,7 +368,7 @@ eval_makefile (const char *filename, unsigned short flags)
- #endif
- case ENOMEM:
- {
-- const char *err = strerror (deps->error);
-+ const char *err = strerror (makefile_errno);
- OS (fatal, reading_file, "%s", err);
- }
- }
-@@ -395,8 +392,14 @@ eval_makefile (const char *filename, unsigned short flags)
- }
- }
-
-- /* Enter the final name for this makefile as a goaldep. */
-+ /* Now we have the final name for this makefile. Enter it into
-+ the cache. */
- filename = strcache_add (filename);
-+
-+ /* Add FILENAME to the chain of read makefiles. */
-+ deps = alloc_goaldep ();
-+ deps->next = read_files;
-+ read_files = deps;
- deps->file = lookup_file (filename);
- if (deps->file == 0)
- deps->file = enter_file (filename);
-@@ -405,19 +408,17 @@ eval_makefile (const char *filename, unsigned short flags)
-
- free (expanded);
-
-+ /* If the makefile can't be found at all, give up entirely. */
-+
- if (ebuf.fp == 0)
- {
-- /* The makefile can't be read at all, give up entirely.
-- If we did some searching errno has the error from the last attempt,
-- rather from FILENAME itself: recover the more accurate one. */
-- errno = deps->error;
-- deps->file->last_mtime = NONEXISTENT_MTIME;
-+ /* If we did some searching, errno has the error from the last
-+ attempt, rather from FILENAME itself. Store it in case the
-+ caller wants to use it in a message. */
-+ errno = makefile_errno;
- return deps;
- }
-
-- /* Success; clear errno. */
-- deps->error = 0;
--
- /* Avoid leaking the makefile to children. */
- fd_noinherit (fileno (ebuf.fp));
-
-@@ -908,7 +909,10 @@ eval (struct ebuffer *ebuf, int set_default)
- struct goaldep *d = eval_makefile (files->name, flags);
-
- if (errno)
-- d->floc = *fstart;
-+ {
-+ d->error = (unsigned short)errno;
-+ d->floc = *fstart;
-+ }
-
- free_ns (files);
- files = next;
-diff --git a/tests/scripts/features/include b/tests/scripts/features/include
-index 0c63c06..67f8e65 100644
---- a/tests/scripts/features/include
-+++ b/tests/scripts/features/include
-@@ -237,27 +237,4 @@ inc1: foo; echo > $@
- rmfiles('inc1');
- }
-
--# Including files that can't be read should show an error
--if (defined $ERR_unreadable_file) {
-- create_file('inc1', 'FOO := foo');
-- chmod 0000, 'inc1';
--
-- run_make_test(q!
--include inc1
--all:;@echo $(FOO)
--!,
-- '', "#MAKEFILE#:2: inc1: $ERR_unreadable_file\n#MAKE#: *** No rule to make target 'inc1'. Stop.", 512);
--
--# Unreadable files that we know how to successfully recreate should work
--
-- run_make_test(sprintf(q!
--all:;@echo $(FOO)
--include inc1
--inc1:; @%s $@ && echo FOO := bar > $@
--!, $CMD_rmfile),
-- '', "bar");
--
-- rmfiles('inc1');
--}
--
- 1;
---
-2.26.1
-
diff --git a/srcpkgs/make/template b/srcpkgs/make/template
index 9a980aa10dde..930a357f3f39 100644
--- a/srcpkgs/make/template
+++ b/srcpkgs/make/template
@@ -1,17 +1,17 @@
# Template file for 'make'
pkgname=make
-version=4.3
-revision=3
+version=4.4.1
+revision=1
bootstrap=yes
build_style=gnu-configure
configure_args="$(vopt_with guile)"
hostmakedepends="$(vopt_if guile pkg-config)"
makedepends="$(vopt_if guile 'gc-devel guile-devel')"
-checkdepends="perl"
+checkdepends="perl tar"
short_desc="GNU Make build tool"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/make"
distfiles="${GNU_SITE}/make/${pkgname}-${version}.tar.lz"
-checksum=de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82
+checksum=8814ba072182b605d156d7589c19a43b89fc58ea479b9355146160946f8cf6e9
build_options=guile
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] make: update to 4.4.1.
2023-07-16 11:54 [PR PATCH] make: update to 4.4.1 motorto
2023-07-16 11:56 ` [PR PATCH] [Updated] " motorto
2023-07-16 11:59 ` motorto
@ 2023-07-16 12:04 ` motorto
2023-07-24 20:49 ` [PR PATCH] [Merged]: " Duncaen
3 siblings, 0 replies; 6+ messages in thread
From: motorto @ 2023-07-16 12:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 720 bytes --]
There is an updated pull request by motorto against master on the void-packages repository
https://github.com/motorto/void-packages make-4.4.1
https://github.com/void-linux/void-packages/pull/45059
make: update to 4.4.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**, more testers welcomed
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (cross)
- aarch64 (cross)
A patch file from https://github.com/void-linux/void-packages/pull/45059.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-make-4.4.1-45059.patch --]
[-- Type: text/x-diff, Size: 8325 bytes --]
From 143d422a7aec31d359f87bc92d0aa5081319c20d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sun, 16 Jul 2023 12:47:07 +0100
Subject: [PATCH] make: update to 4.4.1.
---
.../make/patches/regression-openjdk9.patch | 207 ------------------
srcpkgs/make/template | 9 +-
2 files changed, 5 insertions(+), 211 deletions(-)
delete mode 100644 srcpkgs/make/patches/regression-openjdk9.patch
diff --git a/srcpkgs/make/patches/regression-openjdk9.patch b/srcpkgs/make/patches/regression-openjdk9.patch
deleted file mode 100644
index 52e5d336ce66..000000000000
--- a/srcpkgs/make/patches/regression-openjdk9.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-From 9c29c1b082fd59b57f3c15b17900ca1da0db8ad1 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 18 Apr 2020 19:57:44 +0200
-Subject: [PATCH] Revert "[SV 40236] Handle included file open failures
- properly."
-
-This reverts commit c5ccc4930c3805604813def4455bc2e90635349e.
-
-This commit breaks build of openjdk9 at very least.
----
- src/main.c | 25 +++++++++-----------
- src/read.c | 42 +++++++++++++++++++---------------
- tests/scripts/features/include | 23 -------------------
- 3 files changed, 34 insertions(+), 56 deletions(-)
-
-diff --git a/src/main.c b/src/main.c
-index bcba2d1..6c892a8 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -2180,7 +2180,8 @@ main (int argc, char **argv, char **envp)
- {
- /* Update any makefiles if necessary. */
-
-- FILE_TIMESTAMP *makefile_mtimes;
-+ FILE_TIMESTAMP *makefile_mtimes = 0;
-+ unsigned int mm_idx = 0;
- char **aargv = NULL;
- const char **nargv;
- int nargc;
-@@ -2188,22 +2189,12 @@ main (int argc, char **argv, char **envp)
-
- DB (DB_BASIC, (_("Updating makefiles....\n")));
-
-- {
-- struct goaldep *d;
-- unsigned int num_mkfiles = 0;
-- for (d = read_files; d != NULL; d = d->next)
-- ++num_mkfiles;
--
-- makefile_mtimes = alloca (num_mkfiles * sizeof (FILE_TIMESTAMP));
-- }
--
- /* Remove any makefiles we don't want to try to update. Record the
- current modtimes of the others so we can compare them later. */
- {
-- struct goaldep *d = read_files;
-- struct goaldep *last = NULL;
-- unsigned int mm_idx = 0;
--
-+ register struct goaldep *d, *last;
-+ last = 0;
-+ d = read_files;
- while (d != 0)
- {
- struct file *f;
-@@ -2237,6 +2228,9 @@ main (int argc, char **argv, char **envp)
- }
- else
- {
-+ makefile_mtimes = xrealloc (makefile_mtimes,
-+ (mm_idx+1)
-+ * sizeof (FILE_TIMESTAMP));
- makefile_mtimes[mm_idx++] = file_mtime_no_search (d->file);
- last = d;
- d = d->next;
-@@ -2496,6 +2490,9 @@ main (int argc, char **argv, char **envp)
- free (aargv);
- break;
- }
-+
-+ /* Free the makefile mtimes. */
-+ free (makefile_mtimes);
- }
-
- /* Set up 'MAKEFLAGS' again for the normal targets. */
-diff --git a/src/read.c b/src/read.c
-index db52a55..39b5885 100644
---- a/src/read.c
-+++ b/src/read.c
-@@ -321,11 +321,7 @@ eval_makefile (const char *filename, unsigned short flags)
- struct ebuffer ebuf;
- const floc *curfile;
- char *expanded = 0;
--
-- /* Create a new goaldep entry. */
-- deps = alloc_goaldep ();
-- deps->next = read_files;
-- read_files = deps;
-+ int makefile_errno;
-
- ebuf.floc.filenm = filename; /* Use the original file name. */
- ebuf.floc.lineno = 1;
-@@ -356,12 +352,13 @@ eval_makefile (const char *filename, unsigned short flags)
- filename = expanded;
- }
-
-- errno = 0;
- ENULLLOOP (ebuf.fp, fopen (filename, "r"));
-- deps->error = errno;
-+
-+ /* Save the error code so we print the right message later. */
-+ makefile_errno = errno;
-
- /* Check for unrecoverable errors: out of mem or FILE slots. */
-- switch (deps->error)
-+ switch (makefile_errno)
- {
- #ifdef EMFILE
- case EMFILE:
-@@ -371,7 +368,7 @@ eval_makefile (const char *filename, unsigned short flags)
- #endif
- case ENOMEM:
- {
-- const char *err = strerror (deps->error);
-+ const char *err = strerror (makefile_errno);
- OS (fatal, reading_file, "%s", err);
- }
- }
-@@ -395,8 +392,14 @@ eval_makefile (const char *filename, unsigned short flags)
- }
- }
-
-- /* Enter the final name for this makefile as a goaldep. */
-+ /* Now we have the final name for this makefile. Enter it into
-+ the cache. */
- filename = strcache_add (filename);
-+
-+ /* Add FILENAME to the chain of read makefiles. */
-+ deps = alloc_goaldep ();
-+ deps->next = read_files;
-+ read_files = deps;
- deps->file = lookup_file (filename);
- if (deps->file == 0)
- deps->file = enter_file (filename);
-@@ -405,19 +408,17 @@ eval_makefile (const char *filename, unsigned short flags)
-
- free (expanded);
-
-+ /* If the makefile can't be found at all, give up entirely. */
-+
- if (ebuf.fp == 0)
- {
-- /* The makefile can't be read at all, give up entirely.
-- If we did some searching errno has the error from the last attempt,
-- rather from FILENAME itself: recover the more accurate one. */
-- errno = deps->error;
-- deps->file->last_mtime = NONEXISTENT_MTIME;
-+ /* If we did some searching, errno has the error from the last
-+ attempt, rather from FILENAME itself. Store it in case the
-+ caller wants to use it in a message. */
-+ errno = makefile_errno;
- return deps;
- }
-
-- /* Success; clear errno. */
-- deps->error = 0;
--
- /* Avoid leaking the makefile to children. */
- fd_noinherit (fileno (ebuf.fp));
-
-@@ -908,7 +909,10 @@ eval (struct ebuffer *ebuf, int set_default)
- struct goaldep *d = eval_makefile (files->name, flags);
-
- if (errno)
-- d->floc = *fstart;
-+ {
-+ d->error = (unsigned short)errno;
-+ d->floc = *fstart;
-+ }
-
- free_ns (files);
- files = next;
-diff --git a/tests/scripts/features/include b/tests/scripts/features/include
-index 0c63c06..67f8e65 100644
---- a/tests/scripts/features/include
-+++ b/tests/scripts/features/include
-@@ -237,27 +237,4 @@ inc1: foo; echo > $@
- rmfiles('inc1');
- }
-
--# Including files that can't be read should show an error
--if (defined $ERR_unreadable_file) {
-- create_file('inc1', 'FOO := foo');
-- chmod 0000, 'inc1';
--
-- run_make_test(q!
--include inc1
--all:;@echo $(FOO)
--!,
-- '', "#MAKEFILE#:2: inc1: $ERR_unreadable_file\n#MAKE#: *** No rule to make target 'inc1'. Stop.", 512);
--
--# Unreadable files that we know how to successfully recreate should work
--
-- run_make_test(sprintf(q!
--all:;@echo $(FOO)
--include inc1
--inc1:; @%s $@ && echo FOO := bar > $@
--!, $CMD_rmfile),
-- '', "bar");
--
-- rmfiles('inc1');
--}
--
- 1;
---
-2.26.1
-
diff --git a/srcpkgs/make/template b/srcpkgs/make/template
index 9a980aa10dde..72934811c3cd 100644
--- a/srcpkgs/make/template
+++ b/srcpkgs/make/template
@@ -1,17 +1,18 @@
# Template file for 'make'
pkgname=make
-version=4.3
-revision=3
+version=4.4.1
+revision=1
bootstrap=yes
build_style=gnu-configure
configure_args="$(vopt_with guile)"
hostmakedepends="$(vopt_if guile pkg-config)"
makedepends="$(vopt_if guile 'gc-devel guile-devel')"
-checkdepends="perl"
+checkdepends="perl tar"
short_desc="GNU Make build tool"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/make"
distfiles="${GNU_SITE}/make/${pkgname}-${version}.tar.lz"
-checksum=de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82
+checksum=8814ba072182b605d156d7589c19a43b89fc58ea479b9355146160946f8cf6e9
build_options=guile
+make_check=ci-skip #features/temp_stdin Error running /builddir/make-4.4.1/tests/../make (expected 512; got 0)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: make: update to 4.4.1.
2023-07-16 11:54 [PR PATCH] make: update to 4.4.1 motorto
` (2 preceding siblings ...)
2023-07-16 12:04 ` motorto
@ 2023-07-24 20:49 ` Duncaen
3 siblings, 0 replies; 6+ messages in thread
From: Duncaen @ 2023-07-24 20:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 561 bytes --]
There's a merged pull request on the void-packages repository
make: update to 4.4.1.
https://github.com/void-linux/void-packages/pull/45059
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**, more testers welcomed
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (cross)
- aarch64 (cross)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PR PATCH] make: update to 4.4.1.
@ 2023-03-03 21:55 mhmdanas
0 siblings, 0 replies; 6+ messages in thread
From: mhmdanas @ 2023-03-03 21:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1225 bytes --]
There is a new pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages make-4.4.1
https://github.com/void-linux/void-packages/pull/42578
make: update to 4.4.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
@Gottox
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42578.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-make-4.4.1-42578.patch --]
[-- Type: text/x-diff, Size: 8171 bytes --]
From 14d370ad0aec77b1f422d234d67d996970bce027 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 3 Mar 2023 21:51:51 +0000
Subject: [PATCH] make: update to 4.4.1.
---
.../make/patches/regression-openjdk9.patch | 207 ------------------
srcpkgs/make/template | 10 +-
2 files changed, 5 insertions(+), 212 deletions(-)
delete mode 100644 srcpkgs/make/patches/regression-openjdk9.patch
diff --git a/srcpkgs/make/patches/regression-openjdk9.patch b/srcpkgs/make/patches/regression-openjdk9.patch
deleted file mode 100644
index 52e5d336ce66..000000000000
--- a/srcpkgs/make/patches/regression-openjdk9.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-From 9c29c1b082fd59b57f3c15b17900ca1da0db8ad1 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 18 Apr 2020 19:57:44 +0200
-Subject: [PATCH] Revert "[SV 40236] Handle included file open failures
- properly."
-
-This reverts commit c5ccc4930c3805604813def4455bc2e90635349e.
-
-This commit breaks build of openjdk9 at very least.
----
- src/main.c | 25 +++++++++-----------
- src/read.c | 42 +++++++++++++++++++---------------
- tests/scripts/features/include | 23 -------------------
- 3 files changed, 34 insertions(+), 56 deletions(-)
-
-diff --git a/src/main.c b/src/main.c
-index bcba2d1..6c892a8 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -2180,7 +2180,8 @@ main (int argc, char **argv, char **envp)
- {
- /* Update any makefiles if necessary. */
-
-- FILE_TIMESTAMP *makefile_mtimes;
-+ FILE_TIMESTAMP *makefile_mtimes = 0;
-+ unsigned int mm_idx = 0;
- char **aargv = NULL;
- const char **nargv;
- int nargc;
-@@ -2188,22 +2189,12 @@ main (int argc, char **argv, char **envp)
-
- DB (DB_BASIC, (_("Updating makefiles....\n")));
-
-- {
-- struct goaldep *d;
-- unsigned int num_mkfiles = 0;
-- for (d = read_files; d != NULL; d = d->next)
-- ++num_mkfiles;
--
-- makefile_mtimes = alloca (num_mkfiles * sizeof (FILE_TIMESTAMP));
-- }
--
- /* Remove any makefiles we don't want to try to update. Record the
- current modtimes of the others so we can compare them later. */
- {
-- struct goaldep *d = read_files;
-- struct goaldep *last = NULL;
-- unsigned int mm_idx = 0;
--
-+ register struct goaldep *d, *last;
-+ last = 0;
-+ d = read_files;
- while (d != 0)
- {
- struct file *f;
-@@ -2237,6 +2228,9 @@ main (int argc, char **argv, char **envp)
- }
- else
- {
-+ makefile_mtimes = xrealloc (makefile_mtimes,
-+ (mm_idx+1)
-+ * sizeof (FILE_TIMESTAMP));
- makefile_mtimes[mm_idx++] = file_mtime_no_search (d->file);
- last = d;
- d = d->next;
-@@ -2496,6 +2490,9 @@ main (int argc, char **argv, char **envp)
- free (aargv);
- break;
- }
-+
-+ /* Free the makefile mtimes. */
-+ free (makefile_mtimes);
- }
-
- /* Set up 'MAKEFLAGS' again for the normal targets. */
-diff --git a/src/read.c b/src/read.c
-index db52a55..39b5885 100644
---- a/src/read.c
-+++ b/src/read.c
-@@ -321,11 +321,7 @@ eval_makefile (const char *filename, unsigned short flags)
- struct ebuffer ebuf;
- const floc *curfile;
- char *expanded = 0;
--
-- /* Create a new goaldep entry. */
-- deps = alloc_goaldep ();
-- deps->next = read_files;
-- read_files = deps;
-+ int makefile_errno;
-
- ebuf.floc.filenm = filename; /* Use the original file name. */
- ebuf.floc.lineno = 1;
-@@ -356,12 +352,13 @@ eval_makefile (const char *filename, unsigned short flags)
- filename = expanded;
- }
-
-- errno = 0;
- ENULLLOOP (ebuf.fp, fopen (filename, "r"));
-- deps->error = errno;
-+
-+ /* Save the error code so we print the right message later. */
-+ makefile_errno = errno;
-
- /* Check for unrecoverable errors: out of mem or FILE slots. */
-- switch (deps->error)
-+ switch (makefile_errno)
- {
- #ifdef EMFILE
- case EMFILE:
-@@ -371,7 +368,7 @@ eval_makefile (const char *filename, unsigned short flags)
- #endif
- case ENOMEM:
- {
-- const char *err = strerror (deps->error);
-+ const char *err = strerror (makefile_errno);
- OS (fatal, reading_file, "%s", err);
- }
- }
-@@ -395,8 +392,14 @@ eval_makefile (const char *filename, unsigned short flags)
- }
- }
-
-- /* Enter the final name for this makefile as a goaldep. */
-+ /* Now we have the final name for this makefile. Enter it into
-+ the cache. */
- filename = strcache_add (filename);
-+
-+ /* Add FILENAME to the chain of read makefiles. */
-+ deps = alloc_goaldep ();
-+ deps->next = read_files;
-+ read_files = deps;
- deps->file = lookup_file (filename);
- if (deps->file == 0)
- deps->file = enter_file (filename);
-@@ -405,19 +408,17 @@ eval_makefile (const char *filename, unsigned short flags)
-
- free (expanded);
-
-+ /* If the makefile can't be found at all, give up entirely. */
-+
- if (ebuf.fp == 0)
- {
-- /* The makefile can't be read at all, give up entirely.
-- If we did some searching errno has the error from the last attempt,
-- rather from FILENAME itself: recover the more accurate one. */
-- errno = deps->error;
-- deps->file->last_mtime = NONEXISTENT_MTIME;
-+ /* If we did some searching, errno has the error from the last
-+ attempt, rather from FILENAME itself. Store it in case the
-+ caller wants to use it in a message. */
-+ errno = makefile_errno;
- return deps;
- }
-
-- /* Success; clear errno. */
-- deps->error = 0;
--
- /* Avoid leaking the makefile to children. */
- fd_noinherit (fileno (ebuf.fp));
-
-@@ -908,7 +909,10 @@ eval (struct ebuffer *ebuf, int set_default)
- struct goaldep *d = eval_makefile (files->name, flags);
-
- if (errno)
-- d->floc = *fstart;
-+ {
-+ d->error = (unsigned short)errno;
-+ d->floc = *fstart;
-+ }
-
- free_ns (files);
- files = next;
-diff --git a/tests/scripts/features/include b/tests/scripts/features/include
-index 0c63c06..67f8e65 100644
---- a/tests/scripts/features/include
-+++ b/tests/scripts/features/include
-@@ -237,27 +237,4 @@ inc1: foo; echo > $@
- rmfiles('inc1');
- }
-
--# Including files that can't be read should show an error
--if (defined $ERR_unreadable_file) {
-- create_file('inc1', 'FOO := foo');
-- chmod 0000, 'inc1';
--
-- run_make_test(q!
--include inc1
--all:;@echo $(FOO)
--!,
-- '', "#MAKEFILE#:2: inc1: $ERR_unreadable_file\n#MAKE#: *** No rule to make target 'inc1'. Stop.", 512);
--
--# Unreadable files that we know how to successfully recreate should work
--
-- run_make_test(sprintf(q!
--all:;@echo $(FOO)
--include inc1
--inc1:; @%s $@ && echo FOO := bar > $@
--!, $CMD_rmfile),
-- '', "bar");
--
-- rmfiles('inc1');
--}
--
- 1;
---
-2.26.1
-
diff --git a/srcpkgs/make/template b/srcpkgs/make/template
index 9a980aa10dde..1617b3b1c338 100644
--- a/srcpkgs/make/template
+++ b/srcpkgs/make/template
@@ -1,7 +1,7 @@
# Template file for 'make'
pkgname=make
-version=4.3
-revision=3
+version=4.4.1
+revision=1
bootstrap=yes
build_style=gnu-configure
configure_args="$(vopt_with guile)"
@@ -11,7 +11,7 @@ checkdepends="perl"
short_desc="GNU Make build tool"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="http://www.gnu.org/software/make"
-distfiles="${GNU_SITE}/make/${pkgname}-${version}.tar.lz"
-checksum=de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82
+homepage="https://www.gnu.org/software/make"
+distfiles="${GNU_SITE}/make/make-${version}.tar.lz"
+checksum=8814ba072182b605d156d7589c19a43b89fc58ea479b9355146160946f8cf6e9
build_options=guile
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-07-24 20:49 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-16 11:54 [PR PATCH] make: update to 4.4.1 motorto
2023-07-16 11:56 ` [PR PATCH] [Updated] " motorto
2023-07-16 11:59 ` motorto
2023-07-16 12:04 ` motorto
2023-07-24 20:49 ` [PR PATCH] [Merged]: " Duncaen
-- strict thread matches above, loose matches on Subject: below --
2023-03-03 21:55 [PR PATCH] " mhmdanas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).