[PR PATCH] make: inject make-4.3 fnmatch and glob

[PR PATCH] make: inject make-4.3 fnmatch and glob

[pullmoll]

[-- Attachment #1: Type: text/plain, Size: 432 bytes --]

There is a new pull request by pullmoll against master on the void-packages repository

https://github.com/pullmoll/void-packages make
https://github.com/void-linux/void-packages/pull/21104

make: inject make-4.3 fnmatch and glob
Use the faster and fixed(?) fnmatch and glob
implementations found in the make-4.3 archive.

Solves: #21089

A patch file from https://github.com/void-linux/void-packages/pull/21104.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-make-21104.patch --]
[-- Type: text/x-diff, Size: 1762 bytes --]

From 4554b5d6402fecf05992caea8e747a2666f9bfcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 18 Apr 2020 07:54:46 +0200
Subject: [PATCH] make: inject make-4.3 fnmatch and glob

Use the faster and fixed(?) fnmatch and glob
implementations found in the make-4.3 archive.

Solves: #21089
---
 srcpkgs/make/template | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/make/template b/srcpkgs/make/template
index 22559e22efd..ea7b87138e0 100644
--- a/srcpkgs/make/template
+++ b/srcpkgs/make/template
@@ -4,17 +4,29 @@
 pkgname=make
 reverts="4.3_1"
 version=4.2.1
-revision=7
+revision=8
 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')"
-short_desc="The GNU make system"
+short_desc="GNU make system"
 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.bz2"
-checksum=d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589
+distfiles="${GNU_SITE}/make/${pkgname}-${version}.tar.bz2
+ ${GNU_SITE}/make/${pkgname}-4.3.tar.lz"
+checksum="d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589
+ de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82"
+skip_extraction="make-4.3.tar.lz"
 build_options=guile
 patch_args="-Np1"
+
+pre_configure() {
+	bsdtar xvpf $XBPS_SRCDISTDIR/$pkgname-$version/make-4.3.tar.lz \
+		make-4.3/lib/{fnmatch,glob}.*
+	cp -p make-4.3/lib/fnmatch.* glob/
+	cp -p make-4.3/lib/glob.* glob/
+	mv -v glob/fnmatch{.in,}.h
+	mv -v glob/glob{.in,}.h
+}

Re: make: inject make-4.3 fnmatch and glob

[q66]

[-- Attachment #1: Type: text/plain, Size: 207 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/21104#issuecomment-615905709

Comment:
i believe i found the regression in 4.3, so hold on with this for now.

Re: make: inject make-4.3 fnmatch and glob

[q66]

[-- Attachment #1: Type: text/plain, Size: 246 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/21104#issuecomment-615906209

Comment:
okay, looks like the revert I made fixed Aegisub but not `openjdk9-bootstrap`, I'll try looking further... :/

Re: make: inject make-4.3 fnmatch and glob

[xtraeme]

[-- Attachment #1: Type: text/plain, Size: 173 bytes --]

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/21104#issuecomment-615908763

Comment:
is musl only affected, isn't it?

Re: make: inject make-4.3 fnmatch and glob

[q66]

[-- Attachment #1: Type: text/plain, Size: 231 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/21104#issuecomment-615911843

Comment:
these bugs affect all

i found the commit breaking openjdk9-bootstrap, it's quite old though

Re: make: inject make-4.3 fnmatch and glob

[xtraeme]

[-- Attachment #1: Type: text/plain, Size: 175 bytes --]

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/21104#issuecomment-615912233

Comment:
hmm ok, let's see what you've find

Re: make: inject make-4.3 fnmatch and glob

[xtraeme]

[-- Attachment #1: Type: text/plain, Size: 176 bytes --]

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/21104#issuecomment-615912233

Comment:
hmm ok, let's see what you've found

Re: make: inject make-4.3 fnmatch and glob

[q66]

[-- Attachment #1: Type: text/plain, Size: 172 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/21104#issuecomment-615915584

Comment:
I have patches for both issues now.

Re: [PR PATCH] [Closed]: make: inject make-4.3 fnmatch and glob

[q66]

[-- Attachment #1: Type: text/plain, Size: 282 bytes --]

There's a closed pull request on the void-packages repository

make: inject make-4.3 fnmatch and glob
https://github.com/void-linux/void-packages/pull/21104

Description:
Use the faster and fixed(?) fnmatch and glob
implementations found in the make-4.3 archive.

Solves: #21089

Re: make: inject make-4.3 fnmatch and glob

[xtraeme]

[-- Attachment #1: Type: text/plain, Size: 167 bytes --]

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/21104#issuecomment-615915909

Comment:
hmm why do you close this?

Re: make: inject make-4.3 fnmatch and glob

[q66]

[-- Attachment #1: Type: text/plain, Size: 202 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/21104#issuecomment-615916070

Comment:
because it's unnecessary? if we're gonna update make to 4.3 again

Re: make: inject make-4.3 fnmatch and glob

[xtraeme]

[-- Attachment #1: Type: text/plain, Size: 146 bytes --]

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/21104#issuecomment-615916219

Comment:
ah ok

Re: make: inject make-4.3 fnmatch and glob

[q66]

[-- Attachment #1: Type: text/plain, Size: 228 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/21104#issuecomment-615916920

Comment:
https://github.com/void-linux/void-packages/commit/85761cc5800c7bebf4fc1244a9e15f142518a361