From 4e5709ef2baaed3fc97fc2c968aa8965469cb3ae Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Wed, 26 Jul 2023 10:28:47 +0200 Subject: [PATCH] net-misc/tinyssh: Use pkg-config instead of hardcoding libsodium flags Signed-off-by: Haelwenn (lanodan) Monnier Closes: https://github.com/gentoo/gentoo/pull/32045 Signed-off-by: Sam James --- 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 6a91309a999d6..4b288ff014ec1 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 6a91309a999d6..4b288ff014ec1 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