diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
| commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
| tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /sys-apps/pciutils/files | |
| parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) | |
gentoo resync : 29.12.2022
Diffstat (limited to 'sys-apps/pciutils/files')
3 files changed, 53 insertions, 13 deletions
diff --git a/sys-apps/pciutils/files/pciutils-3.1.9-static-pc.patch b/sys-apps/pciutils/files/pciutils-3.1.9-static-pc.patch deleted file mode 100644 index 9e63b7ecd661..000000000000 --- a/sys-apps/pciutils/files/pciutils-3.1.9-static-pc.patch +++ /dev/null @@ -1,13 +0,0 @@ -make sure all lib entries get into libs.private in the .pc file - ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -61,7 +61,7 @@ $(PCILIBPC): libpci.pc.in - -e 's,@LIBDIR@,$(LIBDIR),' \ - -e 's,@IDSDIR@,$(IDSDIR),' \ - -e 's,@VERSION@,$(VERSION),' \ -- -e 's,@LDLIBS@,$(LDLIBS),' -+ -e 's,@LDLIBS@,$(LDLIBS) $(LIB_LDLIBS),' - - init.o: init.c $(INCL) - access.o: access.c $(INCL) diff --git a/sys-apps/pciutils/files/pciutils-3.8.0-no-which.patch b/sys-apps/pciutils/files/pciutils-3.8.0-no-which.patch new file mode 100644 index 000000000000..3024d73555d3 --- /dev/null +++ b/sys-apps/pciutils/files/pciutils-3.8.0-no-which.patch @@ -0,0 +1,34 @@ +https://github.com/pciutils/pciutils/pull/105 + +From 91bf24dd3c91f826377548b7e164b49cfed56f9a Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sun, 19 Jun 2022 23:52:22 +0100 +Subject: [PATCH 1/2] lib/configure: drop usage of which + +'which' is not required by POSIX and is an external command which may not be +available, and 'command -v' does the job just fine. + +Debian and Gentoo at least are both making efforts to drop which from +their base system package list. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/lib/configure ++++ b/lib/configure +@@ -238,7 +238,7 @@ if [ "$sys" = linux ] ; then + PKG_CONFIG=pkg-config + fi + if [ "$LIBKMOD" != no ] ; then +- if ! which $PKG_CONFIG >/dev/null ; then ++ if ! command -v $PKG_CONFIG >/dev/null ; then + echo_n "($PKG_CONFIG not found) " + elif $PKG_CONFIG libkmod ; then + LIBKMOD_DETECTED=1 +@@ -268,7 +268,7 @@ if [ "$sys" = linux ] ; then + if [ "$HWDB" = yes -o "$HWDB" = no ] ; then + echo "$HWDB (set manually)" + else +- if `which pkg-config >/dev/null && pkg-config --atleast-version=196 libudev` ; then ++ if `command -v pkg-config >/dev/null && pkg-config --atleast-version=196 libudev` ; then + HWDB=yes + else + HWDB=no diff --git a/sys-apps/pciutils/files/pciutils-3.8.0-pkg-config.patch b/sys-apps/pciutils/files/pciutils-3.8.0-pkg-config.patch new file mode 100644 index 000000000000..4630609bad24 --- /dev/null +++ b/sys-apps/pciutils/files/pciutils-3.8.0-pkg-config.patch @@ -0,0 +1,19 @@ +https://github.com/pciutils/pciutils/pull/105 + +From a74832198ab36683a867c79b3d6ef2cac9baad55 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sun, 19 Jun 2022 23:53:42 +0100 +Subject: [PATCH 2/2] lib/configure: respect $PKG_CONFIG completely + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/lib/configure ++++ b/lib/configure +@@ -268,7 +268,7 @@ if [ "$sys" = linux ] ; then + if [ "$HWDB" = yes -o "$HWDB" = no ] ; then + echo "$HWDB (set manually)" + else +- if `command -v pkg-config >/dev/null && pkg-config --atleast-version=196 libudev` ; then ++ if `command -v $PKG_CONFIG >/dev/null && $PKG_CONFIG --atleast-version=196 libudev` ; then + HWDB=yes + else + HWDB=no |