From 34e503b92d5259cb2ac9075d06a24ff2f0e01f26 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Mon, 7 Feb 2022 10:41:58 +0000
Subject: [PATCH] sys-libs/libucontext: use consistent emake arguments

Should be no functional change.

Signed-off-by: Sam James <sam@gentoo.org>
---
 .../libucontext/libucontext-1.1-r1.ebuild     | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/sys-libs/libucontext/libucontext-1.1-r1.ebuild b/sys-libs/libucontext/libucontext-1.1-r1.ebuild
index cf76cfa1a7566..7ec73298a79c9 100644
--- a/sys-libs/libucontext/libucontext-1.1-r1.ebuild
+++ b/sys-libs/libucontext/libucontext-1.1-r1.ebuild
@@ -27,7 +27,7 @@ PATCHES=(
 src_compile() {
 	tc-export AR CC
 
-	local arch
+	arch=
 
 	# Override arch detection
 	# https://github.com/kaniini/libucontext/blob/master/Makefile#L3
@@ -43,13 +43,25 @@ src_compile() {
 		arch="$(uname -m)"
 	fi
 
-	emake ARCH="${arch}" LDFLAGS="${LDFLAGS}" all $(usev man 'docs')
+	emake \
+		ARCH="${arch}" \
+		LDFLAGS="${LDFLAGS}" \
+		LIBDIR="/usr/$(get_libdir)" \
+		all $(usev man 'docs')
 }
 
 src_test() {
-	emake LDFLAGS="${LDFLAGS}" check
+	emake \
+		ARCH="${arch}" \
+		LDFLAGS="${LDFLAGS}" \
+		LIBDIR="/usr/$(get_libdir)" \
+		check
 }
 
 src_install() {
-	emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install $(usev man 'install_docs')
+	emake \
+		ARCH="${arch}" \
+		DESTDIR="${ED}" \
+		LIBDIR="/usr/$(get_libdir)" \
+		install $(usev man 'install_docs')
 }