From 503ce48204b44a4bd91c4286a0001fed9af67d7b Mon Sep 17 00:00:00 2001 From: mhmdanas 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 +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 : wait for a file named to exist + # tmout : Change the timeout for waiting. Default is 4 seconds. + # sleep : Sleep for seconds then echo ++# term : send SIGTERM to PID + # fail : echo 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 -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 " 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 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 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 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 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 " 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 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 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 +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"