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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5B73A15864F for ; Mon, 27 Mar 2023 21:53:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73FA4E0829; Mon, 27 Mar 2023 21:53:46 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5C5D8E0829 for ; Mon, 27 Mar 2023 21:53:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7D506340EB9 for ; Mon, 27 Mar 2023 21:53:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DF7658E4 for ; Mon, 27 Mar 2023 21:53:43 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1679953964.2ffe2a899b506a6cfccee2fe7abf3174be3ccac8.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/oidc-agent/oidc-agent-4.5.1.ebuild X-VCS-Directories: net-misc/oidc-agent/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 2ffe2a899b506a6cfccee2fe7abf3174be3ccac8 X-VCS-Branch: master Date: Mon, 27 Mar 2023 21:53:43 +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: f42a0300-eb23-4f4a-9ccc-533b7217b1ec X-Archives-Hash: 111abeb3d74de6d13fd6579a39b50fa4 commit: 2ffe2a899b506a6cfccee2fe7abf3174be3ccac8 Author: Marek Szuba gentoo org> AuthorDate: Mon Mar 27 21:52:44 2023 +0000 Commit: Marek Szuba gentoo org> CommitDate: Mon Mar 27 21:52:44 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ffe2a89 net-misc/oidc-agent: 4.5.1: pass USE_SO vars to all emake calls Signed-off-by: Marek Szuba gentoo.org> net-misc/oidc-agent/oidc-agent-4.5.1.ebuild | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild b/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild index d036c301e3b3..34e8613dbf7d 100644 --- a/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild +++ b/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild @@ -38,17 +38,24 @@ src_prepare() { sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile" } +oidc_emake() { + local mymakeargs=( + USE_CJSON_SO=1 + USE_LIST_SO=0 + USE_MUSTACHE_SO=0 + USE_ARGP_SO=$(usex elibc_musl 1 0) + ) + + emake "${mymakeargs[@]}" $@ +} + src_compile() { - local -x USE_CJSON_SO=1 - local -x USE_LIST_SO=0 - local -x USE_MUSTACHE_SO=0 - use elibc_musl && local -x USE_ARGP_SO=1 - emake -j1 create_obj_dir_structure create_picobj_dir_structure # Bug #880157 - emake + oidc_emake -j1 create_obj_dir_structure create_picobj_dir_structure # Bug #880157 + oidc_emake } src_install() { - emake \ + oidc_emake \ PREFIX="${ED}" \ BIN_AFTER_INST_PATH="/usr" \ INCLUDE_PATH="${ED}"/usr/include \