* [PR PATCH] make: update to 4.4.1.
@ 2023-03-03 21:55 mhmdanas
2023-03-04 12:55 ` [PR PATCH] [Updated] " mhmdanas
` (8 more replies)
0 siblings, 9 replies; 13+ 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] 13+ messages in thread
* Re: [PR PATCH] [Updated] make: update to 4.4.1.
2023-03-03 21:55 [PR PATCH] make: update to 4.4.1 mhmdanas
@ 2023-03-04 12:55 ` mhmdanas
2023-03-05 21:24 ` mhmdanas
` (7 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: mhmdanas @ 2023-03-04 12:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1230 bytes --]
There is an updated 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: 8283 bytes --]
From 17a6930a0ab58f5ce938ed74088defac7a192610 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 | 12 +-
2 files changed, 6 insertions(+), 213 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..57bee51ec1c3 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
+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] 13+ messages in thread
* Re: [PR PATCH] [Updated] make: update to 4.4.1.
2023-03-03 21:55 [PR PATCH] make: update to 4.4.1 mhmdanas
2023-03-04 12:55 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-03-05 21:24 ` mhmdanas
2023-03-05 21:27 ` mhmdanas
` (6 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: mhmdanas @ 2023-03-05 21:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1230 bytes --]
There is an updated 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: 16449 bytes --]
From 503ce48204b44a4bd91c4286a0001fed9af67d7b Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 3 Mar 2023 21:51:51 +0000
Subject: [PATCH 1/6] make: update to 4.4.1.
---
srcpkgs/make/patches/fix-tests.patch | 74 +++++++
.../make/patches/regression-openjdk9.patch | 207 ------------------
srcpkgs/make/template | 12 +-
3 files changed, 80 insertions(+), 213 deletions(-)
create mode 100644 srcpkgs/make/patches/fix-tests.patch
delete mode 100644 srcpkgs/make/patches/regression-openjdk9.patch
diff --git a/srcpkgs/make/patches/fix-tests.patch b/srcpkgs/make/patches/fix-tests.patch
new file mode 100644
index 000000000000..d82d18fc8faa
--- /dev/null
+++ b/srcpkgs/make/patches/fix-tests.patch
@@ -0,0 +1,74 @@
+From deb4ff272a589d74950e120b800a35e212261f75 Mon Sep 17 00:00:00 2001
+From: Paul Smith <psmith@gnu.org>
+Date: Sun, 6 Nov 2022 14:14:28 -0500
+Subject: [SV 63315] tests: Simplify TERM signaling
+
+Tests that try to kill the make process were not behaving as expected
+on OpenBSD: the signal was sent from make to its children but the
+sleep didn't die. Something odd about the way the shell treats TERM.
+To reduce platform dependencies add "term" to the helper tool and run
+that instead of kill / sleep.
+
+* tests/thelp.pl: Add a new operation "term" that takes a PID.
+* tests/scripts/features/output-sync: Use it.
+* tests/scripts/features/temp_stdin: Ditto.
+---
+ tests/scripts/features/output-sync | 2 +-
+ tests/scripts/features/temp_stdin | 2 +-
+ tests/thelp.pl | 7 +++++++
+ 3 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/tests/scripts/features/output-sync b/tests/scripts/features/output-sync
+index 13a54ca..4054699 100644
+--- a/tests/scripts/features/output-sync
++++ b/tests/scripts/features/output-sync
+@@ -360,7 +360,7 @@ use POSIX ();
+ # file.
+ run_make_test(q!
+ pid:=$(shell echo $$PPID)
+-all:; @kill -TERM $(pid) && sleep 16
++all:; @#HELPER# term $(pid) sleep 10
+ !, '-O -j2', '/#MAKE#: \*\*\* \[#MAKEFILE#:3: all] Terminated/', POSIX::SIGTERM);
+ }
+
+diff --git a/tests/scripts/features/temp_stdin b/tests/scripts/features/temp_stdin
+index b06df53..c01d627 100644
+--- a/tests/scripts/features/temp_stdin
++++ b/tests/scripts/features/temp_stdin
+@@ -71,7 +71,7 @@ run_make_test(q!
+ include bye.mk
+ pid:=$(shell echo $$PPID)
+ all:;
+-bye.mk: force; @kill -TERM $(pid) && sleep 16
++bye.mk: force; @#HELPER# term $(pid) sleep 10
+ force:
+ !, '-f-', '/#MAKE#: \*\*\* \[#MAKEFILE#:5: bye.mk] Terminated/', POSIX::SIGTERM);
+ }
+diff --git a/tests/thelp.pl b/tests/thelp.pl
+index 993339c..c243bcb 100755
+--- a/tests/thelp.pl
++++ b/tests/thelp.pl
+@@ -16,6 +16,7 @@
+ # wait <word> : wait for a file named <word> to exist
+ # tmout <secs> : Change the timeout for waiting. Default is 4 seconds.
+ # sleep <secs> : Sleep for <secs> seconds then echo <secs>
++# term <pid> : send SIGTERM to PID <pid>
+ # fail <err> : echo <err> to stdout then exit with error code err
+ #
+ # If given -q only the "out" command generates output.
+@@ -95,6 +96,12 @@ sub op {
+ return 1;
+ }
+
++ if ($op eq 'term') {
++ print "term $nm\n";
++ kill('TERM', $nm);
++ return 1;
++ }
++
+ if ($op eq 'fail') {
+ print "fail $nm\n";
+ exit($nm);
+--
+cgit v1.1
+
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..57bee51ec1c3 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
+homepage="https://www.gnu.org/software/make"
+distfiles="${GNU_SITE}/make/make-${version}.tar.lz"
+checksum=8814ba072182b605d156d7589c19a43b89fc58ea479b9355146160946f8cf6e9
build_options=guile
From d4a1874c0a46056db075f35e2a674798216d3c29 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 5 Mar 2023 21:19:52 +0000
Subject: [PATCH 2/6] alpine: fix build.
---
srcpkgs/alpine/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..56bf330994b3 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -17,6 +17,7 @@ license="Apache-2.0"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
+disable_parallel_build=yes
post_extract() {
sed -i -e '/run test program/s/^/: /' \
From 66e54b6a10ba8f25586e59f0a10edb582e7b4b42 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 5 Mar 2023 21:20:40 +0000
Subject: [PATCH 3/6] flite: fix build.
---
srcpkgs/flite/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/flite/template b/srcpkgs/flite/template
index 85afadf8d84b..f376bf122115 100644
--- a/srcpkgs/flite/template
+++ b/srcpkgs/flite/template
@@ -11,6 +11,8 @@ license="BSD-4-Clause"
homepage="http://www.festvox.org/flite/"
distfiles="https://github.com/festvox/flite/archive/v$version.tar.gz"
checksum=ab1555fe5adc3f99f1d4a1a0eb1596d329fd6d74f1464a0097c81f53c0cf9e5c
+# https://github.com/festvox/flite/issues/86
+disable_parallel_build=yes
post_install() {
vlicense COPYING
@@ -18,10 +20,10 @@ post_install() {
flite-devel_package() {
short_desc+=" - development files"
- depends="flite>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove usr/lib/*.a
- vmove usr/lib/*.so
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
}
}
From a2cf21407e1d2119b509aadbd421048ab1388723 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 5 Mar 2023 21:20:58 +0000
Subject: [PATCH 4/6] klystrack: fix build.
---
srcpkgs/klystrack/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/klystrack/template b/srcpkgs/klystrack/template
index 0fa6d524ff98..523d42bab46d 100644
--- a/srcpkgs/klystrack/template
+++ b/srcpkgs/klystrack/template
@@ -14,6 +14,7 @@ distfiles="https://github.com/kometbomb/klystrack/archive/${version}.tar.gz
https://github.com/kometbomb/klystron/archive/${_klystronsha}.tar.gz"
checksum="569dc552ffdfcef94cb1ed993b41494e0c52a7ec15d0cdf614490b92f6611efb
877bf4b7dc506ede2309c5c9c838d58d52ff031fef7415e9b491ce584078e2f5"
+disable_parallel_build=yes
CFLAGS="-fcommon"
From 0fe0d72a1668c20652b09a04f59e5fff754fe91e Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 5 Mar 2023 21:21:20 +0000
Subject: [PATCH 5/6] t1lib: fix build.
---
srcpkgs/t1lib/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/t1lib/template b/srcpkgs/t1lib/template
index b6457db0a3a8..dcec10b0fd1c 100644
--- a/srcpkgs/t1lib/template
+++ b/srcpkgs/t1lib/template
@@ -10,9 +10,10 @@ makedepends="libXaw-devel"
short_desc="Rasterizer library for Adobe Type 1 fonts"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
-homepage="http://www.ibiblio.org/pub/Linux/libs/graphics/!INDEX.html"
-distfiles="http://www.ibiblio.org/pub/Linux/libs/graphics/${pkgname}-${version}.tar.gz"
+homepage="https://www.ibiblio.org/pub/Linux/libs/graphics/!INDEX.html"
+distfiles="https://www.ibiblio.org/pub/Linux/libs/graphics/t1lib-${version}.tar.gz"
checksum=821328b5054f7890a0d0cd2f52825270705df3641dbd476d58d17e56ed957b59
+disable_parallel_build=yes
libt1_package() {
short_desc+=" - runtime libraries"
@@ -22,7 +23,7 @@ libt1_package() {
}
t1lib-devel_package() {
- depends="libXaw-devel libt1>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision} libXaw-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 4bcd9cef3a5692c7eb26ec4856e80d18d1c667cf Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 5 Mar 2023 21:21:30 +0000
Subject: [PATCH 6/6] timeshift: fix build.
---
srcpkgs/timeshift/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index 3e8fa0d212c4..7c198d15cfe6 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -13,14 +13,16 @@ homepage="https://github.com/linuxmint/timeshift"
changelog="https://raw.githubusercontent.com/linuxmint/timeshift/master/debian/changelog"
distfiles="https://github.com/linuxmint/timeshift/archive/${version}/timeshift-${version}.tar.gz"
checksum=36fd19865d1d30dc5f6eca468ceaa3dad01cd95d9090d050d67f5c2cd98fe37d
+# https://github.com/linuxmint/timeshift/issues/101
+disable_parallel_build=yes
-# Remove hard-dep on crontab, leave up to user to decide
post_extract() {
+ # Remove hard-dep on crontab, leave up to user to decide
vsed -i src/Core/Main.vala -e '/dependencies/s:"crontab",::'
}
-# timeshift.1.gz is not a gzip file.
pre_install() {
+ # timeshift.1.gz is not a gzip file.
mv man/timeshift.1.gz man/timeshift.1
gzip man/timeshift.1
}
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] make: update to 4.4.1.
2023-03-03 21:55 [PR PATCH] make: update to 4.4.1 mhmdanas
2023-03-04 12:55 ` [PR PATCH] [Updated] " mhmdanas
2023-03-05 21:24 ` mhmdanas
@ 2023-03-05 21:27 ` mhmdanas
2023-03-05 21:38 ` mhmdanas
` (5 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: mhmdanas @ 2023-03-05 21:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1230 bytes --]
There is an updated 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: 18514 bytes --]
From 503ce48204b44a4bd91c4286a0001fed9af67d7b Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 3 Mar 2023 21:51:51 +0000
Subject: [PATCH 1/7] make: update to 4.4.1.
---
srcpkgs/make/patches/fix-tests.patch | 74 +++++++
.../make/patches/regression-openjdk9.patch | 207 ------------------
srcpkgs/make/template | 12 +-
3 files changed, 80 insertions(+), 213 deletions(-)
create mode 100644 srcpkgs/make/patches/fix-tests.patch
delete mode 100644 srcpkgs/make/patches/regression-openjdk9.patch
diff --git a/srcpkgs/make/patches/fix-tests.patch b/srcpkgs/make/patches/fix-tests.patch
new file mode 100644
index 000000000000..d82d18fc8faa
--- /dev/null
+++ b/srcpkgs/make/patches/fix-tests.patch
@@ -0,0 +1,74 @@
+From deb4ff272a589d74950e120b800a35e212261f75 Mon Sep 17 00:00:00 2001
+From: Paul Smith <psmith@gnu.org>
+Date: Sun, 6 Nov 2022 14:14:28 -0500
+Subject: [SV 63315] tests: Simplify TERM signaling
+
+Tests that try to kill the make process were not behaving as expected
+on OpenBSD: the signal was sent from make to its children but the
+sleep didn't die. Something odd about the way the shell treats TERM.
+To reduce platform dependencies add "term" to the helper tool and run
+that instead of kill / sleep.
+
+* tests/thelp.pl: Add a new operation "term" that takes a PID.
+* tests/scripts/features/output-sync: Use it.
+* tests/scripts/features/temp_stdin: Ditto.
+---
+ tests/scripts/features/output-sync | 2 +-
+ tests/scripts/features/temp_stdin | 2 +-
+ tests/thelp.pl | 7 +++++++
+ 3 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/tests/scripts/features/output-sync b/tests/scripts/features/output-sync
+index 13a54ca..4054699 100644
+--- a/tests/scripts/features/output-sync
++++ b/tests/scripts/features/output-sync
+@@ -360,7 +360,7 @@ use POSIX ();
+ # file.
+ run_make_test(q!
+ pid:=$(shell echo $$PPID)
+-all:; @kill -TERM $(pid) && sleep 16
++all:; @#HELPER# term $(pid) sleep 10
+ !, '-O -j2', '/#MAKE#: \*\*\* \[#MAKEFILE#:3: all] Terminated/', POSIX::SIGTERM);
+ }
+
+diff --git a/tests/scripts/features/temp_stdin b/tests/scripts/features/temp_stdin
+index b06df53..c01d627 100644
+--- a/tests/scripts/features/temp_stdin
++++ b/tests/scripts/features/temp_stdin
+@@ -71,7 +71,7 @@ run_make_test(q!
+ include bye.mk
+ pid:=$(shell echo $$PPID)
+ all:;
+-bye.mk: force; @kill -TERM $(pid) && sleep 16
++bye.mk: force; @#HELPER# term $(pid) sleep 10
+ force:
+ !, '-f-', '/#MAKE#: \*\*\* \[#MAKEFILE#:5: bye.mk] Terminated/', POSIX::SIGTERM);
+ }
+diff --git a/tests/thelp.pl b/tests/thelp.pl
+index 993339c..c243bcb 100755
+--- a/tests/thelp.pl
++++ b/tests/thelp.pl
+@@ -16,6 +16,7 @@
+ # wait <word> : wait for a file named <word> to exist
+ # tmout <secs> : Change the timeout for waiting. Default is 4 seconds.
+ # sleep <secs> : Sleep for <secs> seconds then echo <secs>
++# term <pid> : send SIGTERM to PID <pid>
+ # fail <err> : echo <err> to stdout then exit with error code err
+ #
+ # If given -q only the "out" command generates output.
+@@ -95,6 +96,12 @@ sub op {
+ return 1;
+ }
+
++ if ($op eq 'term') {
++ print "term $nm\n";
++ kill('TERM', $nm);
++ return 1;
++ }
++
+ if ($op eq 'fail') {
+ print "fail $nm\n";
+ exit($nm);
+--
+cgit v1.1
+
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..57bee51ec1c3 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
+homepage="https://www.gnu.org/software/make"
+distfiles="${GNU_SITE}/make/make-${version}.tar.lz"
+checksum=8814ba072182b605d156d7589c19a43b89fc58ea479b9355146160946f8cf6e9
build_options=guile
From d4a1874c0a46056db075f35e2a674798216d3c29 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 5 Mar 2023 21:19:52 +0000
Subject: [PATCH 2/7] alpine: fix build.
---
srcpkgs/alpine/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..56bf330994b3 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -17,6 +17,7 @@ license="Apache-2.0"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
+disable_parallel_build=yes
post_extract() {
sed -i -e '/run test program/s/^/: /' \
From 66e54b6a10ba8f25586e59f0a10edb582e7b4b42 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 5 Mar 2023 21:20:40 +0000
Subject: [PATCH 3/7] flite: fix build.
---
srcpkgs/flite/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/flite/template b/srcpkgs/flite/template
index 85afadf8d84b..f376bf122115 100644
--- a/srcpkgs/flite/template
+++ b/srcpkgs/flite/template
@@ -11,6 +11,8 @@ license="BSD-4-Clause"
homepage="http://www.festvox.org/flite/"
distfiles="https://github.com/festvox/flite/archive/v$version.tar.gz"
checksum=ab1555fe5adc3f99f1d4a1a0eb1596d329fd6d74f1464a0097c81f53c0cf9e5c
+# https://github.com/festvox/flite/issues/86
+disable_parallel_build=yes
post_install() {
vlicense COPYING
@@ -18,10 +20,10 @@ post_install() {
flite-devel_package() {
short_desc+=" - development files"
- depends="flite>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove usr/lib/*.a
- vmove usr/lib/*.so
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
}
}
From a2cf21407e1d2119b509aadbd421048ab1388723 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 5 Mar 2023 21:20:58 +0000
Subject: [PATCH 4/7] klystrack: fix build.
---
srcpkgs/klystrack/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/klystrack/template b/srcpkgs/klystrack/template
index 0fa6d524ff98..523d42bab46d 100644
--- a/srcpkgs/klystrack/template
+++ b/srcpkgs/klystrack/template
@@ -14,6 +14,7 @@ distfiles="https://github.com/kometbomb/klystrack/archive/${version}.tar.gz
https://github.com/kometbomb/klystron/archive/${_klystronsha}.tar.gz"
checksum="569dc552ffdfcef94cb1ed993b41494e0c52a7ec15d0cdf614490b92f6611efb
877bf4b7dc506ede2309c5c9c838d58d52ff031fef7415e9b491ce584078e2f5"
+disable_parallel_build=yes
CFLAGS="-fcommon"
From 0fe0d72a1668c20652b09a04f59e5fff754fe91e Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 5 Mar 2023 21:21:20 +0000
Subject: [PATCH 5/7] t1lib: fix build.
---
srcpkgs/t1lib/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/t1lib/template b/srcpkgs/t1lib/template
index b6457db0a3a8..dcec10b0fd1c 100644
--- a/srcpkgs/t1lib/template
+++ b/srcpkgs/t1lib/template
@@ -10,9 +10,10 @@ makedepends="libXaw-devel"
short_desc="Rasterizer library for Adobe Type 1 fonts"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
-homepage="http://www.ibiblio.org/pub/Linux/libs/graphics/!INDEX.html"
-distfiles="http://www.ibiblio.org/pub/Linux/libs/graphics/${pkgname}-${version}.tar.gz"
+homepage="https://www.ibiblio.org/pub/Linux/libs/graphics/!INDEX.html"
+distfiles="https://www.ibiblio.org/pub/Linux/libs/graphics/t1lib-${version}.tar.gz"
checksum=821328b5054f7890a0d0cd2f52825270705df3641dbd476d58d17e56ed957b59
+disable_parallel_build=yes
libt1_package() {
short_desc+=" - runtime libraries"
@@ -22,7 +23,7 @@ libt1_package() {
}
t1lib-devel_package() {
- depends="libXaw-devel libt1>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision} libXaw-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 4bcd9cef3a5692c7eb26ec4856e80d18d1c667cf Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 5 Mar 2023 21:21:30 +0000
Subject: [PATCH 6/7] timeshift: fix build.
---
srcpkgs/timeshift/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index 3e8fa0d212c4..7c198d15cfe6 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -13,14 +13,16 @@ homepage="https://github.com/linuxmint/timeshift"
changelog="https://raw.githubusercontent.com/linuxmint/timeshift/master/debian/changelog"
distfiles="https://github.com/linuxmint/timeshift/archive/${version}/timeshift-${version}.tar.gz"
checksum=36fd19865d1d30dc5f6eca468ceaa3dad01cd95d9090d050d67f5c2cd98fe37d
+# https://github.com/linuxmint/timeshift/issues/101
+disable_parallel_build=yes
-# Remove hard-dep on crontab, leave up to user to decide
post_extract() {
+ # Remove hard-dep on crontab, leave up to user to decide
vsed -i src/Core/Main.vala -e '/dependencies/s:"crontab",::'
}
-# timeshift.1.gz is not a gzip file.
pre_install() {
+ # timeshift.1.gz is not a gzip file.
mv man/timeshift.1.gz man/timeshift.1
gzip man/timeshift.1
}
From 46fb4edb21ce9d165eb42dd6e165f8aead431fc4 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 5 Mar 2023 21:26:53 +0000
Subject: [PATCH 7/7] elixir: fix build.
---
srcpkgs/elixir/patches/fix-build.patch | 27 ++++++++++++++++++++++++++
srcpkgs/elixir/template | 2 +-
2 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/elixir/patches/fix-build.patch
diff --git a/srcpkgs/elixir/patches/fix-build.patch b/srcpkgs/elixir/patches/fix-build.patch
new file mode 100644
index 000000000000..81d40f751da8
--- /dev/null
+++ b/srcpkgs/elixir/patches/fix-build.patch
@@ -0,0 +1,27 @@
+From c668ce22b0dd72261621f19f124490eb5425eacd Mon Sep 17 00:00:00 2001
+From: Matthew Smith <matthew@gentoo.org>
+Date: Tue, 15 Nov 2022 21:38:50 +0000
+Subject: [PATCH] Disable parallel build in Make 4.4
+
+In versions of GNU Make prior to 4.4, ".NOTPARALLEL: compile" made the whole
+build run serially. In 4.4 and later, ".NOTPARALLEL: compile" makes only
+the compile target run serially.
+
+This breaks the build and can lead to e.g. EEx being built before Mix.
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index f6ba18d90e..8bb5bcdc65 100644
+--- a/Makefile
++++ b/Makefile
+@@ -24,7 +24,7 @@ SOURCE_DATE_EPOCH_PATH = lib/elixir/tmp/ebin_reproducible
+ SOURCE_DATE_EPOCH_FILE = $(SOURCE_DATE_EPOCH_PATH)/SOURCE_DATE_EPOCH
+
+ .PHONY: install compile erlang elixir unicode app build_plt clean_plt dialyze test check_reproducible clean clean_residual_files format install_man clean_man docs Docs.zip Precompiled.zip zips
+-.NOTPARALLEL: compile
++.NOTPARALLEL:
+
+ #==> Functions
+
diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template
index 412511fa7eeb..68749936a84d 100644
--- a/srcpkgs/elixir/template
+++ b/srcpkgs/elixir/template
@@ -3,7 +3,7 @@ pkgname=elixir
version=1.14.3
revision=1
build_style=gnu-makefile
-make_check_target="test"
+make_check_target=test
hostmakedepends="erlang"
depends="erlang>=23"
checkdepends="git"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] make: update to 4.4.1.
2023-03-03 21:55 [PR PATCH] make: update to 4.4.1 mhmdanas
` (2 preceding siblings ...)
2023-03-05 21:27 ` mhmdanas
@ 2023-03-05 21:38 ` mhmdanas
2023-03-11 11:17 ` mhmdanas
` (4 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: mhmdanas @ 2023-03-05 21:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1230 bytes --]
There is an updated 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: 15588 bytes --]
From 4c57d62213c270efb639488e73fe0e553744ea4c Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 3 Mar 2023 21:51:51 +0000
Subject: [PATCH 1/7] make: update to 4.4.1.
---
.../make/patches/regression-openjdk9.patch | 207 ------------------
srcpkgs/make/template | 12 +-
2 files changed, 6 insertions(+), 213 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..57bee51ec1c3 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
+homepage="https://www.gnu.org/software/make"
+distfiles="${GNU_SITE}/make/make-${version}.tar.lz"
+checksum=8814ba072182b605d156d7589c19a43b89fc58ea479b9355146160946f8cf6e9
build_options=guile
From 5cce3ceeeca199371993f85fb3c526fe3761db40 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 5 Mar 2023 21:19:52 +0000
Subject: [PATCH 2/7] alpine: fix build.
---
srcpkgs/alpine/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 02c4f944515c..56bf330994b3 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -17,6 +17,7 @@ license="Apache-2.0"
homepage="https://repo.or.cz/alpine.git"
distfiles="https://repo.or.cz/alpine.git/snapshot/${_githash}.tar.gz"
checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431
+disable_parallel_build=yes
post_extract() {
sed -i -e '/run test program/s/^/: /' \
From 043370d180e4fe59d6dd38e0101f0fe5eead1412 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 5 Mar 2023 21:20:40 +0000
Subject: [PATCH 3/7] flite: fix build.
---
srcpkgs/flite/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/flite/template b/srcpkgs/flite/template
index 85afadf8d84b..f376bf122115 100644
--- a/srcpkgs/flite/template
+++ b/srcpkgs/flite/template
@@ -11,6 +11,8 @@ license="BSD-4-Clause"
homepage="http://www.festvox.org/flite/"
distfiles="https://github.com/festvox/flite/archive/v$version.tar.gz"
checksum=ab1555fe5adc3f99f1d4a1a0eb1596d329fd6d74f1464a0097c81f53c0cf9e5c
+# https://github.com/festvox/flite/issues/86
+disable_parallel_build=yes
post_install() {
vlicense COPYING
@@ -18,10 +20,10 @@ post_install() {
flite-devel_package() {
short_desc+=" - development files"
- depends="flite>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove usr/lib/*.a
- vmove usr/lib/*.so
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
}
}
From 87842fbca76799417298feb8bbe4b0d00c9b106c Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 5 Mar 2023 21:20:58 +0000
Subject: [PATCH 4/7] klystrack: fix build.
---
srcpkgs/klystrack/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/klystrack/template b/srcpkgs/klystrack/template
index 0fa6d524ff98..523d42bab46d 100644
--- a/srcpkgs/klystrack/template
+++ b/srcpkgs/klystrack/template
@@ -14,6 +14,7 @@ distfiles="https://github.com/kometbomb/klystrack/archive/${version}.tar.gz
https://github.com/kometbomb/klystron/archive/${_klystronsha}.tar.gz"
checksum="569dc552ffdfcef94cb1ed993b41494e0c52a7ec15d0cdf614490b92f6611efb
877bf4b7dc506ede2309c5c9c838d58d52ff031fef7415e9b491ce584078e2f5"
+disable_parallel_build=yes
CFLAGS="-fcommon"
From 59c34c66b9f71919f638d85978e1bef195b04f0d Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 5 Mar 2023 21:21:20 +0000
Subject: [PATCH 5/7] t1lib: fix build.
---
srcpkgs/t1lib/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/t1lib/template b/srcpkgs/t1lib/template
index b6457db0a3a8..dcec10b0fd1c 100644
--- a/srcpkgs/t1lib/template
+++ b/srcpkgs/t1lib/template
@@ -10,9 +10,10 @@ makedepends="libXaw-devel"
short_desc="Rasterizer library for Adobe Type 1 fonts"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
-homepage="http://www.ibiblio.org/pub/Linux/libs/graphics/!INDEX.html"
-distfiles="http://www.ibiblio.org/pub/Linux/libs/graphics/${pkgname}-${version}.tar.gz"
+homepage="https://www.ibiblio.org/pub/Linux/libs/graphics/!INDEX.html"
+distfiles="https://www.ibiblio.org/pub/Linux/libs/graphics/t1lib-${version}.tar.gz"
checksum=821328b5054f7890a0d0cd2f52825270705df3641dbd476d58d17e56ed957b59
+disable_parallel_build=yes
libt1_package() {
short_desc+=" - runtime libraries"
@@ -22,7 +23,7 @@ libt1_package() {
}
t1lib-devel_package() {
- depends="libXaw-devel libt1>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision} libXaw-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 22215fc1060e1e9f14e8a274e4a32f693bed7ac3 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 5 Mar 2023 21:21:30 +0000
Subject: [PATCH 6/7] timeshift: fix build.
---
srcpkgs/timeshift/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/timeshift/template b/srcpkgs/timeshift/template
index 3e8fa0d212c4..7c198d15cfe6 100644
--- a/srcpkgs/timeshift/template
+++ b/srcpkgs/timeshift/template
@@ -13,14 +13,16 @@ homepage="https://github.com/linuxmint/timeshift"
changelog="https://raw.githubusercontent.com/linuxmint/timeshift/master/debian/changelog"
distfiles="https://github.com/linuxmint/timeshift/archive/${version}/timeshift-${version}.tar.gz"
checksum=36fd19865d1d30dc5f6eca468ceaa3dad01cd95d9090d050d67f5c2cd98fe37d
+# https://github.com/linuxmint/timeshift/issues/101
+disable_parallel_build=yes
-# Remove hard-dep on crontab, leave up to user to decide
post_extract() {
+ # Remove hard-dep on crontab, leave up to user to decide
vsed -i src/Core/Main.vala -e '/dependencies/s:"crontab",::'
}
-# timeshift.1.gz is not a gzip file.
pre_install() {
+ # timeshift.1.gz is not a gzip file.
mv man/timeshift.1.gz man/timeshift.1
gzip man/timeshift.1
}
From 927844d6cb559aeecba2d4b0fc42e12d98ace446 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 5 Mar 2023 21:26:53 +0000
Subject: [PATCH 7/7] elixir: fix build.
---
srcpkgs/elixir/patches/fix-build.patch | 27 ++++++++++++++++++++++++++
srcpkgs/elixir/template | 2 +-
2 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/elixir/patches/fix-build.patch
diff --git a/srcpkgs/elixir/patches/fix-build.patch b/srcpkgs/elixir/patches/fix-build.patch
new file mode 100644
index 000000000000..81d40f751da8
--- /dev/null
+++ b/srcpkgs/elixir/patches/fix-build.patch
@@ -0,0 +1,27 @@
+From c668ce22b0dd72261621f19f124490eb5425eacd Mon Sep 17 00:00:00 2001
+From: Matthew Smith <matthew@gentoo.org>
+Date: Tue, 15 Nov 2022 21:38:50 +0000
+Subject: [PATCH] Disable parallel build in Make 4.4
+
+In versions of GNU Make prior to 4.4, ".NOTPARALLEL: compile" made the whole
+build run serially. In 4.4 and later, ".NOTPARALLEL: compile" makes only
+the compile target run serially.
+
+This breaks the build and can lead to e.g. EEx being built before Mix.
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index f6ba18d90e..8bb5bcdc65 100644
+--- a/Makefile
++++ b/Makefile
+@@ -24,7 +24,7 @@ SOURCE_DATE_EPOCH_PATH = lib/elixir/tmp/ebin_reproducible
+ SOURCE_DATE_EPOCH_FILE = $(SOURCE_DATE_EPOCH_PATH)/SOURCE_DATE_EPOCH
+
+ .PHONY: install compile erlang elixir unicode app build_plt clean_plt dialyze test check_reproducible clean clean_residual_files format install_man clean_man docs Docs.zip Precompiled.zip zips
+-.NOTPARALLEL: compile
++.NOTPARALLEL:
+
+ #==> Functions
+
diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template
index 412511fa7eeb..68749936a84d 100644
--- a/srcpkgs/elixir/template
+++ b/srcpkgs/elixir/template
@@ -3,7 +3,7 @@ pkgname=elixir
version=1.14.3
revision=1
build_style=gnu-makefile
-make_check_target="test"
+make_check_target=test
hostmakedepends="erlang"
depends="erlang>=23"
checkdepends="git"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: make: update to 4.4.1.
2023-03-03 21:55 [PR PATCH] make: update to 4.4.1 mhmdanas
` (3 preceding siblings ...)
2023-03-05 21:38 ` mhmdanas
@ 2023-03-11 11:17 ` mhmdanas
2023-03-11 11:30 ` mhmdanas
` (3 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: mhmdanas @ 2023-03-11 11:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 246 bytes --]
New comment by mhmdanas on void-packages repository
https://github.com/void-linux/void-packages/pull/42578#issuecomment-1464889117
Comment:
Broken builds on cross-compile to armv6l:
- elinks
- netstniff-ng (-j1 didn't seem to help)
- papi
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: make: update to 4.4.1.
2023-03-03 21:55 [PR PATCH] make: update to 4.4.1 mhmdanas
` (4 preceding siblings ...)
2023-03-11 11:17 ` mhmdanas
@ 2023-03-11 11:30 ` mhmdanas
2023-03-11 13:16 ` mhmdanas
` (2 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: mhmdanas @ 2023-03-11 11:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 236 bytes --]
New comment by mhmdanas on void-packages repository
https://github.com/void-linux/void-packages/pull/42578#issuecomment-1464889117
Comment:
Broken builds on cross-compile to armv6l:
- netstniff-ng (-j1 didn't seem to help)
- papi
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: make: update to 4.4.1.
2023-03-03 21:55 [PR PATCH] make: update to 4.4.1 mhmdanas
` (5 preceding siblings ...)
2023-03-11 11:30 ` mhmdanas
@ 2023-03-11 13:16 ` mhmdanas
2023-06-10 1:59 ` github-actions
2023-06-24 2:05 ` [PR PATCH] [Closed]: " github-actions
8 siblings, 0 replies; 13+ messages in thread
From: mhmdanas @ 2023-03-11 13:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 236 bytes --]
New comment by mhmdanas on void-packages repository
https://github.com/void-linux/void-packages/pull/42578#issuecomment-1464889117
Comment:
Broken builds on cross-compile to armv6l:
- netstniff-ng (-j1 didn't seem to help)
- papi
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: make: update to 4.4.1.
2023-03-03 21:55 [PR PATCH] make: update to 4.4.1 mhmdanas
` (6 preceding siblings ...)
2023-03-11 13:16 ` mhmdanas
@ 2023-06-10 1:59 ` github-actions
2023-06-24 2:05 ` [PR PATCH] [Closed]: " github-actions
8 siblings, 0 replies; 13+ messages in thread
From: github-actions @ 2023-06-10 1:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/42578#issuecomment-1585422937
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Closed]: make: update to 4.4.1.
2023-03-03 21:55 [PR PATCH] make: update to 4.4.1 mhmdanas
` (7 preceding siblings ...)
2023-06-10 1:59 ` github-actions
@ 2023-06-24 2:05 ` github-actions
8 siblings, 0 replies; 13+ messages in thread
From: github-actions @ 2023-06-24 2:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1069 bytes --]
There's a closed pull request on the void-packages repository
make: update to 4.4.1.
https://github.com/void-linux/void-packages/pull/42578
Description:
<!-- 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
-->
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] make: update to 4.4.1.
2023-07-16 11:54 [PR PATCH] " motorto
2023-07-16 11:56 ` [PR PATCH] [Updated] " motorto
2023-07-16 11:59 ` motorto
@ 2023-07-16 12:04 ` motorto
2 siblings, 0 replies; 13+ 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] 13+ messages in thread
* Re: [PR PATCH] [Updated] make: update to 4.4.1.
2023-07-16 11:54 [PR PATCH] " motorto
2023-07-16 11:56 ` [PR PATCH] [Updated] " motorto
@ 2023-07-16 11:59 ` motorto
2023-07-16 12:04 ` motorto
2 siblings, 0 replies; 13+ 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] 13+ messages in thread
* Re: [PR PATCH] [Updated] make: update to 4.4.1.
2023-07-16 11:54 [PR PATCH] " motorto
@ 2023-07-16 11:56 ` motorto
2023-07-16 11:59 ` motorto
2023-07-16 12:04 ` motorto
2 siblings, 0 replies; 13+ 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] 13+ messages in thread
end of thread, other threads:[~2023-07-16 12:04 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-03 21:55 [PR PATCH] make: update to 4.4.1 mhmdanas
2023-03-04 12:55 ` [PR PATCH] [Updated] " mhmdanas
2023-03-05 21:24 ` mhmdanas
2023-03-05 21:27 ` mhmdanas
2023-03-05 21:38 ` mhmdanas
2023-03-11 11:17 ` mhmdanas
2023-03-11 11:30 ` mhmdanas
2023-03-11 13:16 ` mhmdanas
2023-06-10 1:59 ` github-actions
2023-06-24 2:05 ` [PR PATCH] [Closed]: " github-actions
2023-07-16 11:54 [PR PATCH] " motorto
2023-07-16 11:56 ` [PR PATCH] [Updated] " motorto
2023-07-16 11:59 ` motorto
2023-07-16 12:04 ` motorto
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).