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 3575B15800A for ; Wed, 26 Jul 2023 08:41:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6089FE086D; Wed, 26 Jul 2023 08:41:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 4811BE086D for ; Wed, 26 Jul 2023 08:41:37 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7A10E335DB5 for ; Wed, 26 Jul 2023 08:41:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DCDF1B88 for ; Wed, 26 Jul 2023 08:41:34 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1690360861.4e5709ef2baaed3fc97fc2c968aa8965469cb3ae.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/tinyssh/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/tinyssh/tinyssh-20230101.ebuild net-misc/tinyssh/tinyssh-99999999.ebuild X-VCS-Directories: net-misc/tinyssh/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4e5709ef2baaed3fc97fc2c968aa8965469cb3ae X-VCS-Branch: master Date: Wed, 26 Jul 2023 08:41:34 +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: ba90b0f6-6102-48ca-b96a-861431c9fbc2 X-Archives-Hash: 20ff36f7403559527ab2d36da2d4afb6 commit: 4e5709ef2baaed3fc97fc2c968aa8965469cb3ae Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Wed Jul 26 08:28:47 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jul 26 08:41:01 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e5709ef net-misc/tinyssh: Use pkg-config instead of hardcoding libsodium flags Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me> Closes: https://github.com/gentoo/gentoo/pull/32045 Signed-off-by: Sam James gentoo.org> net-misc/tinyssh/tinyssh-20230101.ebuild | 10 ++++++---- net-misc/tinyssh/tinyssh-99999999.ebuild | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/net-misc/tinyssh/tinyssh-20230101.ebuild b/net-misc/tinyssh/tinyssh-20230101.ebuild index 6a91309a999d..4b288ff014ec 100644 --- a/net-misc/tinyssh/tinyssh-20230101.ebuild +++ b/net-misc/tinyssh/tinyssh-20230101.ebuild @@ -40,13 +40,15 @@ src_prepare() { } src_compile() { + tc-export PKG_CONFIG + if use sodium then emake \ - CC="$(tc-getCC)" - LIBS="-lsodium" \ - CFLAGS="${CFLAGS} -I/usr/include/sodium" \ - LDFLAGS="${LDFLAGS} -L/usr/lib" + CC="$(tc-getCC)" \ + LIBS="$("${PKG_CONFIG}" --libs libsodium)" \ + CFLAGS="${CFLAGS} $("${PKG_CONFIG}" --cflags libsodium)" \ + LDFLAGS="${LDFLAGS}" else emake CC="$(tc-getCC)" fi diff --git a/net-misc/tinyssh/tinyssh-99999999.ebuild b/net-misc/tinyssh/tinyssh-99999999.ebuild index 6a91309a999d..4b288ff014ec 100644 --- a/net-misc/tinyssh/tinyssh-99999999.ebuild +++ b/net-misc/tinyssh/tinyssh-99999999.ebuild @@ -40,13 +40,15 @@ src_prepare() { } src_compile() { + tc-export PKG_CONFIG + if use sodium then emake \ - CC="$(tc-getCC)" - LIBS="-lsodium" \ - CFLAGS="${CFLAGS} -I/usr/include/sodium" \ - LDFLAGS="${LDFLAGS} -L/usr/lib" + CC="$(tc-getCC)" \ + LIBS="$("${PKG_CONFIG}" --libs libsodium)" \ + CFLAGS="${CFLAGS} $("${PKG_CONFIG}" --cflags libsodium)" \ + LDFLAGS="${LDFLAGS}" else emake CC="$(tc-getCC)" fi