commit: 4e5709ef2baaed3fc97fc2c968aa8965469cb3ae Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me> AuthorDate: Wed Jul 26 08:28:47 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <contact <AT> hacktivis.me> Closes: https://github.com/gentoo/gentoo/pull/32045 Signed-off-by: Sam James <sam <AT> 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
