mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-07 15:43:49 +02:00
grep: update to 3.8.
* patch out problematic warnings in egrep and fgrep
This commit is contained in:
parent
b5f97a3f2d
commit
ef5ffe4d69
3 changed files with 13 additions and 25 deletions
10
srcpkgs/grep/patches/efgrep-remove-warning.patch
Normal file
10
srcpkgs/grep/patches/efgrep-remove-warning.patch
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
since 3.8, egrep and fgrep print a warning which can cause many issues with
|
||||||
|
programs not expecting this behaviour
|
||||||
|
|
||||||
|
--- a/src/egrep.sh
|
||||||
|
+++ b/src/egrep.sh
|
||||||
|
@@ -1,4 +1,3 @@
|
||||||
|
#!@SHELL@
|
||||||
|
cmd=${0##*/}
|
||||||
|
-echo "$cmd: warning: $cmd is obsolescent; using @grep@ @option@" >&2
|
||||||
|
exec @grep@ @option@ "$@"
|
|
@ -1,14 +0,0 @@
|
||||||
--- a/lib/sigsegv.c
|
|
||||||
+++ b/lib/sigsegv.c
|
|
||||||
@@ -221,8 +221,10 @@ int libsigsegv_version = LIBSIGSEGV_VERSION;
|
|
||||||
/* both should be equivalent */
|
|
||||||
# if 0
|
|
||||||
# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1]
|
|
||||||
-# else
|
|
||||||
+# elif defined(__GLIBC__)
|
|
||||||
# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1]
|
|
||||||
+# else
|
|
||||||
+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gregs[1]
|
|
||||||
# endif
|
|
||||||
# endif
|
|
||||||
|
|
|
@ -1,22 +1,14 @@
|
||||||
# Template file for 'grep'
|
# Template file for 'grep'
|
||||||
pkgname=grep
|
pkgname=grep
|
||||||
version=3.7
|
version=3.8
|
||||||
revision=1
|
revision=1
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
hostmakedepends="pkg-config"
|
hostmakedepends="pkg-config"
|
||||||
makedepends="pcre-devel"
|
makedepends="pcre2-devel"
|
||||||
checkdepends="perl"
|
checkdepends="perl"
|
||||||
short_desc="GNU grep utility"
|
short_desc="GNU grep utility"
|
||||||
maintainer="Enno Boland <gottox@voidlinux.org>"
|
maintainer="Enno Boland <gottox@voidlinux.org>"
|
||||||
license="GPL-3.0-or-later"
|
license="GPL-3.0-or-later"
|
||||||
homepage="https://www.gnu.org/software/grep/"
|
homepage="https://www.gnu.org/software/grep/"
|
||||||
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
|
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
|
||||||
checksum=5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c
|
checksum=498d7cc1b4fb081904d87343febb73475cf771e424fb7e6141aff66013abc382
|
||||||
|
|
||||||
pre_check() {
|
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
|
||||||
*-musl)
|
|
||||||
# Disable locale tests that fail on musl
|
|
||||||
sed -i '/test-localename$(EXEEXT)/d' gnulib-tests/Makefile
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue