From 786161164290f6a88427c65f21a2abe67232b856 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 19 Aug 2022 15:22:20 -0700 Subject: [PATCH 1/2] grep: fix tests on musl --- srcpkgs/grep/template | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/srcpkgs/grep/template b/srcpkgs/grep/template index 7bab5c9c28e6..e35e92bd5ef4 100644 --- a/srcpkgs/grep/template +++ b/srcpkgs/grep/template @@ -1,4 +1,7 @@ # Template file for 'grep' +# +# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/chroot-grep" +# pkgname=grep version=3.7 revision=1 @@ -12,11 +15,3 @@ license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/grep/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" checksum=5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c - -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 -} From 63f768f7b0252176b8bb6c97deda51105794e602 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Fri, 19 Aug 2022 15:22:39 -0700 Subject: [PATCH 2/2] chroot-grep: update to 3.7. --- srcpkgs/chroot-grep/patches | 1 + srcpkgs/chroot-grep/template | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) create mode 120000 srcpkgs/chroot-grep/patches diff --git a/srcpkgs/chroot-grep/patches b/srcpkgs/chroot-grep/patches new file mode 120000 index 000000000000..bcb05f606dca --- /dev/null +++ b/srcpkgs/chroot-grep/patches @@ -0,0 +1 @@ +../grep/patches \ No newline at end of file diff --git a/srcpkgs/chroot-grep/template b/srcpkgs/chroot-grep/template index 022b01d20de2..7167099959d9 100644 --- a/srcpkgs/chroot-grep/template +++ b/srcpkgs/chroot-grep/template @@ -1,19 +1,23 @@ # Template file for 'chroot-grep' +# +# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/grep" +# pkgname=chroot-grep -version=3.3 +version=3.7 revision=1 wrksrc="grep-${version}" bootstrap=yes build_style=gnu-configure configure_args="--disable-perl-regexp --disable-nls ac_cv_path_GREP=grep" -short_desc="The GNU grep utility - for use with xbps-src" +short_desc="GNU grep utility - for use with xbps-src" maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="http://www.gnu.org/software/grep/" distfiles="${GNU_SITE}/grep/grep-${version}.tar.xz" -checksum=b960541c499619efd6afe1fa795402e4733c8e11ebf9fafccc0bb4bccdc5b514 +checksum=5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c conflicts="grep>=0" provides="grep-${version}_${revision}" +make_check=no # Infinate loop in hash-collision-perf without perl if [ "$XBPS_TARGET_LIBC" = musl ]; then export ac_cv_lib_error_at_line=no