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 06508138334 for ; Fri, 8 Jun 2018 13:06:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41AACE0869; Fri, 8 Jun 2018 13:06:52 +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 13C63E0869 for ; Fri, 8 Jun 2018 13:06:52 +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 AD006335CB7 for ; Fri, 8 Jun 2018 13:06:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2FF7B2E8 for ; Fri, 8 Jun 2018 13:06:49 +0000 (UTC) From: "Aaron Bauman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" Message-ID: <1528463203.29f3f3ff28286ebb0c71a885769800a1155ea241.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/efitools/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/efitools/efitools-1.8.1.ebuild X-VCS-Directories: app-crypt/efitools/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: 29f3f3ff28286ebb0c71a885769800a1155ea241 X-VCS-Branch: master Date: Fri, 8 Jun 2018 13:06:49 +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-Archives-Salt: 62e520dd-cf1e-4a1d-878b-0b93c755a9de X-Archives-Hash: 1d1aa1804365dc9057625e14fa747929 commit: 29f3f3ff28286ebb0c71a885769800a1155ea241 Author: Edward Hyunkoo Jee google com> AuthorDate: Fri Jun 8 06:28:05 2018 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Fri Jun 8 13:06:43 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29f3f3ff app-crypt/efitools: fix dependency and use toolchain-funcs This change fixes the issues addressed during the code review at https://github.com/gentoo/gentoo/pull/8648 . Fixes: ed1d845779b0 ("app-crypt/efitools: support "static" USE flag") Closes: https://github.com/gentoo/gentoo/pull/8755 app-crypt/efitools/efitools-1.8.1.ebuild | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app-crypt/efitools/efitools-1.8.1.ebuild b/app-crypt/efitools/efitools-1.8.1.ebuild index 0a1ca91df52..6ede95860eb 100644 --- a/app-crypt/efitools/efitools-1.8.1.ebuild +++ b/app-crypt/efitools/efitools-1.8.1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit flag-o-matic +inherit flag-o-matic toolchain-funcs DESCRIPTION="Tools for manipulating UEFI secure boot platforms" HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git" @@ -23,10 +23,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) DEPEND="${RDEPEND} app-crypt/sbsigntool dev-perl/File-Slurp - static? ( - ${LIB_DEPEND} - dev-util/pkgconfig - ) + static? ( ${LIB_DEPEND} ) sys-apps/help2man sys-boot/gnu-efi virtual/pkgconfig" @@ -39,7 +36,8 @@ PATCHES=( src_prepare() { if use static; then append-ldflags -static - sed -i 's/-lcrypto/`pkg-config --static --libs libcrypto`/g' Makefile || die + sed -i "s/-lcrypto\b/$($(tc-getPKG_CONFIG) --static --libs libcrypto)/g" \ + Makefile || die fi # Respect users CFLAGS