commit:     8048b1fee105984f879fa67e52bfbc8ab161242f
Author:     François Bissey <frp.bissey <AT> gmail <DOT> com>
AuthorDate: Sat May 21 00:41:54 2022 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri May 27 12:19:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8048b1fe

sci-mathematics/singular: update gcc12 patch

Closes: https://bugs.gentoo.org/841248
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: François René Pierre Bissey <frp.bissey <AT> gmail.com>
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 sci-mathematics/singular/files/singular-4.3.0_p1-gcc12.patch | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

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
index 7654f1710191..570d0be87a29 100644
--- a/sci-mathematics/singular/files/singular-4.3.0_p1-gcc12.patch
+++ b/sci-mathematics/singular/files/singular-4.3.0_p1-gcc12.patch
@@ -1,12 +1,3 @@
-From 5155427417fa722a27c110b2c1939c0979c6dcbc Mon Sep 17 00:00:00 2001
-From: Hans Schoenemann <[email protected]>
-Date: Tue, 10 May 2022 16:52:42 +0200
-Subject: [PATCH] fix: gcc-12 does not like offsetof ?
-
----
- kernel/oswrapper/vspace.cc | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
-
 diff --git a/kernel/oswrapper/vspace.cc b/kernel/oswrapper/vspace.cc
 index fa42bf5e28..aefa661600 100644
 --- a/kernel/oswrapper/vspace.cc
@@ -52,7 +43,7 @@ index fa42bf5e28..aefa661600 100644
  void vmem_free(vaddr_t vaddr) {
    lock_allocator();
 +  #if defined(__GNUC__) && (__GNUC__>11)
-+  vaddr_t vaddr -= (sizeof(vaddr_t)*2);
++  vaddr -= (sizeof(vaddr_t)*2);
 +  #else
    vaddr -= offsetof(Block, data);
 +  #endif

Reply via email to