commit: 89403d02a8a9cfdf3ed6356159505774f0b501c2 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Sep 11 17:45:13 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Sep 11 17:45:13 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89403d02
dev-libs/libgcrypt: fix fgrep warnings in libgcrypt-config Closes: https://bugs.gentoo.org/868384 Signed-off-by: Sam James <sam <AT> gentoo.org> .../libgcrypt-1.9.4-no-fgrep-libgcrypt-config.patch | 21 +++++++++++++++++++++ ...-1.10.1-r1.ebuild => libgcrypt-1.10.1-r2.ebuild} | 1 + ...pt-1.9.4-r1.ebuild => libgcrypt-1.9.4-r2.ebuild} | 1 + 3 files changed, 23 insertions(+) diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.9.4-no-fgrep-libgcrypt-config.patch b/dev-libs/libgcrypt/files/libgcrypt-1.9.4-no-fgrep-libgcrypt-config.patch new file mode 100644 index 000000000000..738eac1631b6 --- /dev/null +++ b/dev-libs/libgcrypt/files/libgcrypt-1.9.4-no-fgrep-libgcrypt-config.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/868384 +--- a/src/libgcrypt-config.in ++++ b/src/libgcrypt-config.in +@@ -154,7 +154,7 @@ if test "$echo_cflags" = "yes"; then + + tmp="" + for i in $includes $cflags_final; do +- if echo "$tmp" | fgrep -v -- "$i" >/dev/null; then ++ if echo "$tmp" | grep -F -v -- "$i" >/dev/null; then + tmp="$tmp $i" + fi + done +@@ -178,7 +178,7 @@ if test "$echo_libs" = "yes"; then + + tmp="" + for i in $libdirs $libs_final; do +- if echo "$tmp" | fgrep -v -- "$i" >/dev/null; then ++ if echo "$tmp" | grep -F -v -- "$i" >/dev/null; then + tmp="$tmp $i" + fi + done diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.1-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild similarity index 98% rename from dev-libs/libgcrypt/libgcrypt-1.10.1-r1.ebuild rename to dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild index b7a3aa4aaf26..285a83d7d62f 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.10.1-r1.ebuild +++ b/dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild @@ -39,6 +39,7 @@ PATCHES=( "${FILESDIR}"/${PN}-multilib-syspath.patch "${FILESDIR}"/${PN}-powerpc-darwin.patch "${FILESDIR}"/${PN}-1.10.1-fix-no-asm-hppa.patch + "${FILESDIR}"/${PN}-1.9.4-no-fgrep-libgcrypt-config.patch ) MULTILIB_CHOST_TOOLS=( diff --git a/dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild similarity index 98% rename from dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild rename to dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild index 713d3c7e3a16..c7a2a6fe71fc 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild +++ b/dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild @@ -39,6 +39,7 @@ PATCHES=( "${FILESDIR}"/${PN}-multilib-syspath.patch "${FILESDIR}"/${PN}-powerpc-darwin.patch "${FILESDIR}"/${PN}-1.9.4-arm-neon-compile-fix.patch + "${FILESDIR}"/${PN}-1.9.4-no-fgrep-libgcrypt-config.patch ) MULTILIB_CHOST_TOOLS=(
