| 1 |
commit: 699f337091c0f6dbea147bca493b5040bb4d12d3 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 29 13:48:22 2020 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 29 13:48:22 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=699f3370 |
| 7 |
|
| 8 |
sys-apps/x86info: [QA] Add missing virtual/pkgconfig dependency |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
| 11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-apps/x86info/files/x86info-1.30-makefile.patch | 28 ++++++++++++++++------ |
| 14 |
sys-apps/x86info/x86info-1.30_p20190617.ebuild | 6 +++-- |
| 15 |
2 files changed, 25 insertions(+), 9 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-apps/x86info/files/x86info-1.30-makefile.patch b/sys-apps/x86info/files/x86info-1.30-makefile.patch |
| 18 |
index e1377c572fb..9e1768d6895 100644 |
| 19 |
--- a/sys-apps/x86info/files/x86info-1.30-makefile.patch |
| 20 |
+++ b/sys-apps/x86info/files/x86info-1.30-makefile.patch |
| 21 |
@@ -21,7 +21,16 @@ |
| 22 |
ifneq ($(SYSROOT),) |
| 23 |
CFLAGS += --sysroot=$(SYSROOT) |
| 24 |
endif |
| 25 |
-@@ -33,14 +33,8 @@ |
| 26 |
+@@ -18,7 +18,7 @@ |
| 27 |
+ CFLAGS += -Wswitch-enum |
| 28 |
+ CFLAGS += -Wundef |
| 29 |
+ CFLAGS += -Wwrite-strings |
| 30 |
+-CFLAGS += $(shell pkg-config --cflags libpci) |
| 31 |
++CFLAGS += $(shell $$PKG_CONFIG --cflags libpci) |
| 32 |
+ |
| 33 |
+ # gcc specific |
| 34 |
+ ifneq ($(shell $(CC) -v 2>&1 | grep -c "clang"), 1) |
| 35 |
+@@ -33,20 +33,8 @@ |
| 36 |
CPP_MAJOR := $(shell $(CPP) -dumpversion 2>&1 | cut -d'.' -f1) |
| 37 |
CPP_MINOR := $(shell $(CPP) -dumpversion 2>&1 | cut -d'.' -f2) |
| 38 |
DEVEL := $(shell grep VERSION Makefile | head -n1 | grep pre | wc -l) |
| 39 |
@@ -33,18 +42,23 @@ |
| 40 |
-ifeq ($(CC),"") |
| 41 |
-CC = gcc |
| 42 |
-endif |
| 43 |
-+LIBS += $(shell pkg-config --libs libpci) |
| 44 |
+- |
| 45 |
+-ifdef STATIC_LIBPCI |
| 46 |
+-LIBPCI = -Wl,-Bstatic -lpci -Wl,-Bdynamic -lz |
| 47 |
+-else |
| 48 |
+-LIBPCI = -lpci |
| 49 |
+-endif |
| 50 |
++LIBS += $(shell $$PKG_CONFIG --libs libpci) |
| 51 |
+ |
| 52 |
+ SHELL = /bin/sh |
| 53 |
|
| 54 |
- ifdef STATIC_LIBPCI |
| 55 |
- LIBPCI = -Wl,-Bstatic -lpci -Wl,-Bdynamic -lz |
| 56 |
-@@ -68,15 +62,15 @@ |
| 57 |
+@@ -68,15 +56,14 @@ |
| 58 |
$(sort $(patsubst %.c,%.o,$(wildcard vendors/*/*.c))) |
| 59 |
|
| 60 |
x86info: $(X86INFO_OBJS) $(X86INFO_HEADERS) |
| 61 |
- $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o x86info $(X86INFO_OBJS) \ |
| 62 |
- $(LIBPCI) |
| 63 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o x86info $(X86INFO_OBJS) \ |
| 64 |
-+ $(LIBPCI) $(LIBS) |
| 65 |
++ $(CC) $(CFLAGS) $(LDFLAGS) -o x86info $(X86INFO_OBJS) $(LIBS) |
| 66 |
|
| 67 |
DEPDIR= .deps |
| 68 |
-include $(X86INFO_SRC:%.c=$(DEPDIR)/%.d) |
| 69 |
|
| 70 |
diff --git a/sys-apps/x86info/x86info-1.30_p20190617.ebuild b/sys-apps/x86info/x86info-1.30_p20190617.ebuild |
| 71 |
index add19ae6a60..e19af2dd09e 100644 |
| 72 |
--- a/sys-apps/x86info/x86info-1.30_p20190617.ebuild |
| 73 |
+++ b/sys-apps/x86info/x86info-1.30_p20190617.ebuild |
| 74 |
@@ -19,7 +19,9 @@ KEYWORDS="-* ~amd64 ~x86" |
| 75 |
|
| 76 |
RDEPEND="sys-apps/pciutils:=" |
| 77 |
DEPEND="${RDEPEND}" |
| 78 |
-BDEPEND="${PYTHON_DEPS}" |
| 79 |
+BDEPEND=" |
| 80 |
+ ${PYTHON_DEPS} |
| 81 |
+ virtual/pkgconfig" |
| 82 |
|
| 83 |
CONFIG_CHECK="~MTRR ~X86_CPUID" |
| 84 |
S="${WORKDIR}/${PN}-${COMMIT}" |
| 85 |
@@ -40,7 +42,7 @@ src_configure() { |
| 86 |
-Wdeclaration-after-statement -Wredundant-decls |
| 87 |
append-ldflags -Wl,-z,relro,-z,now |
| 88 |
|
| 89 |
- tc-export CC |
| 90 |
+ tc-export CC PKG_CONFIG |
| 91 |
} |
| 92 |
|
| 93 |
src_compile() { |
Archives