commit: e03739738c852415ce57e1d996f6e915b3272d82
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 22 14:42:39 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Dec 22 14:42:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0373973
sys-apps/util-linux: Fix build on riscv32
Patch is backport from upstream master
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
.../files/util-linux-2.36.1-riscv32.patch | 29 ++++++++++++++++++++++
sys-apps/util-linux/util-linux-2.36.1-r1.ebuild | 1 +
2 files changed, 30 insertions(+)
diff --git a/sys-apps/util-linux/files/util-linux-2.36.1-riscv32.patch
b/sys-apps/util-linux/files/util-linux-2.36.1-riscv32.patch
new file mode 100644
index 00000000000..b18a01906eb
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.36.1-riscv32.patch
@@ -0,0 +1,29 @@
+From 367972fae13d170675768d63678577cae1890143 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <toscano.p...@tiscali.it>
+Date: Tue, 17 Nov 2020 11:32:45 +0100
+Subject: [PATCH] hwclock: do not assume __NR_settimeofday_time32
+
+Check that __NR_settimeofday_time32 exists before trying to use it as
+syscall number.
+
+Signed-off-by: Pino Toscano <toscano.p...@tiscali.it>
+---
+ sys-utils/hwclock.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
+index 1f7ef3317..db448687d 100644
+--- a/sys-utils/hwclock.c
++++ b/sys-utils/hwclock.c
+@@ -678,7 +678,7 @@ display_time(struct timeval hwctime)
+ #ifndef SYS_settimeofday
+ # ifdef __NR_settimeofday
+ # define SYS_settimeofday __NR_settimeofday
+-# else
++# elif defined(__NR_settimeofday_time32)
+ # define SYS_settimeofday __NR_settimeofday_time32
+ # endif
+ #endif
+--
+2.26.2
+
diff --git a/sys-apps/util-linux/util-linux-2.36.1-r1.ebuild
b/sys-apps/util-linux/util-linux-2.36.1-r1.ebuild
index f7acbfdb151..8008e211b8d 100644
--- a/sys-apps/util-linux/util-linux-2.36.1-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.36.1-r1.ebuild
@@ -77,6 +77,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}/${P}-libmount_dont_use_symfollow.patch" #755878
+ "${FILESDIR}/${P}-riscv32.patch"
)
src_prepare() {
