Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] xbps-src: don't use deprecated egrep
@ 2022-10-17 23:32 paper42
  2022-10-18  4:04 ` classabbyamp
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: paper42 @ 2022-10-17 23:32 UTC (permalink / raw)
  To: ml

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

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

https://github.com/paper42/void-packages xbps-src-no-egrep
https://github.com/void-linux/void-packages/pull/40015

xbps-src: don't use deprecated egrep
grep 3.8 now prints a warning that egrep is deprecated and we should use grep -E instead

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### 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/40015.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xbps-src-no-egrep-40015.patch --]
[-- Type: text/x-diff, Size: 1530 bytes --]

From 130757f17f0d071226b8d8d83589e38e5c1372ac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 18 Oct 2022 00:57:46 +0200
Subject: [PATCH] xbps-src: don't use deprecated egrep

grep 3.8 now prints a warning that egrep is deprecated and we should use
grep -E instead
---
 common/xbps-src/shutils/build_dependencies.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/xbps-src/shutils/build_dependencies.sh b/common/xbps-src/shutils/build_dependencies.sh
index e4e2210d4e56..1d19de54ae80 100644
--- a/common/xbps-src/shutils/build_dependencies.sh
+++ b/common/xbps-src/shutils/build_dependencies.sh
@@ -25,9 +25,9 @@ setup_pkg_depends() {
             _pkgname=$(xbps-uhelper getpkgname $_depname 2>/dev/null)
             [ -z "$_pkgname" ] && _pkgname="$_depname"
             if [ -s ${XBPS_DISTDIR}/etc/virtual ]; then
-                foo=$(egrep "^${_pkgname}[[:blank:]]" ${XBPS_DISTDIR}/etc/virtual|cut -d ' ' -f2)
+                foo=$(grep -E "^${_pkgname}[[:blank:]]" ${XBPS_DISTDIR}/etc/virtual|cut -d ' ' -f2)
             elif [ -s ${XBPS_DISTDIR}/etc/defaults.virtual ]; then
-                foo=$(egrep "^${_pkgname}[[:blank:]]" ${XBPS_DISTDIR}/etc/defaults.virtual|cut -d ' ' -f2)
+                foo=$(grep -E "^${_pkgname}[[:blank:]]" ${XBPS_DISTDIR}/etc/defaults.virtual|cut -d ' ' -f2)
             fi
             if [ -z "$foo" ]; then
                 msg_error "$pkgver: failed to resolve virtual dependency for '$j' (missing from etc/virtual)\n"

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-10-22 13:33 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-17 23:32 [PR PATCH] xbps-src: don't use deprecated egrep paper42
2022-10-18  4:04 ` classabbyamp
2022-10-18 12:10 ` paper42
2022-10-18 16:32 ` classabbyamp
2022-10-22 13:33 ` [PR PATCH] [Merged]: " paper42

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).