| 1 |
commit: 8048b1fee105984f879fa67e52bfbc8ab161242f |
| 2 |
Author: François Bissey <frp.bissey <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat May 21 00:41:54 2022 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 27 12:19:48 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8048b1fe |
| 7 |
|
| 8 |
sci-mathematics/singular: update gcc12 patch |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/841248 |
| 11 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 12 |
Signed-off-by: François René Pierre Bissey <frp.bissey <AT> gmail.com> |
| 13 |
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> |
| 14 |
|
| 15 |
sci-mathematics/singular/files/singular-4.3.0_p1-gcc12.patch | 11 +---------- |
| 16 |
1 file changed, 1 insertion(+), 10 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-mathematics/singular/files/singular-4.3.0_p1-gcc12.patch b/sci-mathematics/singular/files/singular-4.3.0_p1-gcc12.patch |
| 19 |
index 7654f1710191..570d0be87a29 100644 |
| 20 |
--- a/sci-mathematics/singular/files/singular-4.3.0_p1-gcc12.patch |
| 21 |
+++ b/sci-mathematics/singular/files/singular-4.3.0_p1-gcc12.patch |
| 22 |
@@ -1,12 +1,3 @@ |
| 23 |
-From 5155427417fa722a27c110b2c1939c0979c6dcbc Mon Sep 17 00:00:00 2001 |
| 24 |
-From: Hans Schoenemann <hannes@×××××××××××××××××.de> |
| 25 |
-Date: Tue, 10 May 2022 16:52:42 +0200 |
| 26 |
-Subject: [PATCH] fix: gcc-12 does not like offsetof ? |
| 27 |
- |
| 28 |
---- |
| 29 |
- kernel/oswrapper/vspace.cc | 24 ++++++++++++++++++++++++ |
| 30 |
- 1 file changed, 24 insertions(+) |
| 31 |
- |
| 32 |
diff --git a/kernel/oswrapper/vspace.cc b/kernel/oswrapper/vspace.cc |
| 33 |
index fa42bf5e28..aefa661600 100644 |
| 34 |
--- a/kernel/oswrapper/vspace.cc |
| 35 |
@@ -52,7 +43,7 @@ index fa42bf5e28..aefa661600 100644 |
| 36 |
void vmem_free(vaddr_t vaddr) { |
| 37 |
lock_allocator(); |
| 38 |
+ #if defined(__GNUC__) && (__GNUC__>11) |
| 39 |
-+ vaddr_t vaddr -= (sizeof(vaddr_t)*2); |
| 40 |
++ vaddr -= (sizeof(vaddr_t)*2); |
| 41 |
+ #else |
| 42 |
vaddr -= offsetof(Block, data); |
| 43 |
+ #endif |
Archives