| 1 |
commit: e03739738c852415ce57e1d996f6e915b3272d82 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 22 14:42:39 2020 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 22 14:42:58 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0373973 |
| 7 |
|
| 8 |
sys-apps/util-linux: Fix build on riscv32 |
| 9 |
|
| 10 |
Patch is backport from upstream master |
| 11 |
|
| 12 |
Package-Manager: Portage-3.0.9, Repoman-3.0.2 |
| 13 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/util-linux-2.36.1-riscv32.patch | 29 ++++++++++++++++++++++ |
| 16 |
sys-apps/util-linux/util-linux-2.36.1-r1.ebuild | 1 + |
| 17 |
2 files changed, 30 insertions(+) |
| 18 |
|
| 19 |
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 |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..b18a01906eb |
| 22 |
--- /dev/null |
| 23 |
+++ b/sys-apps/util-linux/files/util-linux-2.36.1-riscv32.patch |
| 24 |
@@ -0,0 +1,29 @@ |
| 25 |
+From 367972fae13d170675768d63678577cae1890143 Mon Sep 17 00:00:00 2001 |
| 26 |
+From: Pino Toscano <toscano.pino@×××××××.it> |
| 27 |
+Date: Tue, 17 Nov 2020 11:32:45 +0100 |
| 28 |
+Subject: [PATCH] hwclock: do not assume __NR_settimeofday_time32 |
| 29 |
+ |
| 30 |
+Check that __NR_settimeofday_time32 exists before trying to use it as |
| 31 |
+syscall number. |
| 32 |
+ |
| 33 |
+Signed-off-by: Pino Toscano <toscano.pino@×××××××.it> |
| 34 |
+--- |
| 35 |
+ sys-utils/hwclock.c | 2 +- |
| 36 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 37 |
+ |
| 38 |
+diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c |
| 39 |
+index 1f7ef3317..db448687d 100644 |
| 40 |
+--- a/sys-utils/hwclock.c |
| 41 |
++++ b/sys-utils/hwclock.c |
| 42 |
+@@ -678,7 +678,7 @@ display_time(struct timeval hwctime) |
| 43 |
+ #ifndef SYS_settimeofday |
| 44 |
+ # ifdef __NR_settimeofday |
| 45 |
+ # define SYS_settimeofday __NR_settimeofday |
| 46 |
+-# else |
| 47 |
++# elif defined(__NR_settimeofday_time32) |
| 48 |
+ # define SYS_settimeofday __NR_settimeofday_time32 |
| 49 |
+ # endif |
| 50 |
+ #endif |
| 51 |
+-- |
| 52 |
+2.26.2 |
| 53 |
+ |
| 54 |
|
| 55 |
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 |
| 56 |
index f7acbfdb151..8008e211b8d 100644 |
| 57 |
--- a/sys-apps/util-linux/util-linux-2.36.1-r1.ebuild |
| 58 |
+++ b/sys-apps/util-linux/util-linux-2.36.1-r1.ebuild |
| 59 |
@@ -77,6 +77,7 @@ S="${WORKDIR}/${MY_P}" |
| 60 |
|
| 61 |
PATCHES=( |
| 62 |
"${FILESDIR}/${P}-libmount_dont_use_symfollow.patch" #755878 |
| 63 |
+ "${FILESDIR}/${P}-riscv32.patch" |
| 64 |
) |
| 65 |
|
| 66 |
src_prepare() { |
Archives