From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B303D1382C5 for ; Mon, 29 Jun 2020 13:48:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DBDCFE0907; Mon, 29 Jun 2020 13:48:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BFCEAE0907 for ; Mon, 29 Jun 2020 13:48:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AE18034EF5C for ; Mon, 29 Jun 2020 13:48:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5FBF722B for ; Mon, 29 Jun 2020 13:48:35 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1593438502.699f337091c0f6dbea147bca493b5040bb4d12d3.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/x86info/, sys-apps/x86info/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/x86info/files/x86info-1.30-makefile.patch sys-apps/x86info/x86info-1.30_p20190617.ebuild X-VCS-Directories: sys-apps/x86info/ sys-apps/x86info/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 699f337091c0f6dbea147bca493b5040bb4d12d3 X-VCS-Branch: master Date: Mon, 29 Jun 2020 13:48:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c0b05cb4-789d-47a4-b3ac-0245b78cc778 X-Archives-Hash: bdb1195b69fff5076e0a56b61c627df0 commit: 699f337091c0f6dbea147bca493b5040bb4d12d3 Author: David Seifert gentoo org> AuthorDate: Mon Jun 29 13:48:22 2020 +0000 Commit: David Seifert gentoo org> CommitDate: Mon Jun 29 13:48:22 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=699f3370 sys-apps/x86info: [QA] Add missing virtual/pkgconfig dependency Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: David Seifert gentoo.org> sys-apps/x86info/files/x86info-1.30-makefile.patch | 28 ++++++++++++++++------ sys-apps/x86info/x86info-1.30_p20190617.ebuild | 6 +++-- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/sys-apps/x86info/files/x86info-1.30-makefile.patch b/sys-apps/x86info/files/x86info-1.30-makefile.patch index e1377c572fb..9e1768d6895 100644 --- a/sys-apps/x86info/files/x86info-1.30-makefile.patch +++ b/sys-apps/x86info/files/x86info-1.30-makefile.patch @@ -21,7 +21,16 @@ ifneq ($(SYSROOT),) CFLAGS += --sysroot=$(SYSROOT) endif -@@ -33,14 +33,8 @@ +@@ -18,7 +18,7 @@ + CFLAGS += -Wswitch-enum + CFLAGS += -Wundef + CFLAGS += -Wwrite-strings +-CFLAGS += $(shell pkg-config --cflags libpci) ++CFLAGS += $(shell $$PKG_CONFIG --cflags libpci) + + # gcc specific + ifneq ($(shell $(CC) -v 2>&1 | grep -c "clang"), 1) +@@ -33,20 +33,8 @@ CPP_MAJOR := $(shell $(CPP) -dumpversion 2>&1 | cut -d'.' -f1) CPP_MINOR := $(shell $(CPP) -dumpversion 2>&1 | cut -d'.' -f2) DEVEL := $(shell grep VERSION Makefile | head -n1 | grep pre | wc -l) @@ -33,18 +42,23 @@ -ifeq ($(CC),"") -CC = gcc -endif -+LIBS += $(shell pkg-config --libs libpci) +- +-ifdef STATIC_LIBPCI +-LIBPCI = -Wl,-Bstatic -lpci -Wl,-Bdynamic -lz +-else +-LIBPCI = -lpci +-endif ++LIBS += $(shell $$PKG_CONFIG --libs libpci) + + SHELL = /bin/sh - ifdef STATIC_LIBPCI - LIBPCI = -Wl,-Bstatic -lpci -Wl,-Bdynamic -lz -@@ -68,15 +62,15 @@ +@@ -68,15 +56,14 @@ $(sort $(patsubst %.c,%.o,$(wildcard vendors/*/*.c))) x86info: $(X86INFO_OBJS) $(X86INFO_HEADERS) - $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o x86info $(X86INFO_OBJS) \ - $(LIBPCI) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o x86info $(X86INFO_OBJS) \ -+ $(LIBPCI) $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o x86info $(X86INFO_OBJS) $(LIBS) DEPDIR= .deps -include $(X86INFO_SRC:%.c=$(DEPDIR)/%.d) diff --git a/sys-apps/x86info/x86info-1.30_p20190617.ebuild b/sys-apps/x86info/x86info-1.30_p20190617.ebuild index add19ae6a60..e19af2dd09e 100644 --- a/sys-apps/x86info/x86info-1.30_p20190617.ebuild +++ b/sys-apps/x86info/x86info-1.30_p20190617.ebuild @@ -19,7 +19,9 @@ KEYWORDS="-* ~amd64 ~x86" RDEPEND="sys-apps/pciutils:=" DEPEND="${RDEPEND}" -BDEPEND="${PYTHON_DEPS}" +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig" CONFIG_CHECK="~MTRR ~X86_CPUID" S="${WORKDIR}/${PN}-${COMMIT}" @@ -40,7 +42,7 @@ src_configure() { -Wdeclaration-after-statement -Wredundant-decls append-ldflags -Wl,-z,relro,-z,now - tc-export CC + tc-export CC PKG_CONFIG } src_compile() {