gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-06 00:48:18 -07:00
Code Issues Projects Releases Wiki Activity

net-misc/tinyssh: Use pkg-config instead of hardcoding libsodium flags

Browse Source 
Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Closes: https://github.com/gentoo/gentoo/pull/32045
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Haelwenn (lanodan) Monnier
2023-07-26 10:28:47 +02:00
committed by Sam James
parent d9b7b84f3f
commit 4e5709ef2b
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net-misc/tinyssh/tinyssh-20230101.ebuild
View File

@@ -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

10
net-misc/tinyssh/tinyssh-99999999.ebuild
View File

@@ -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