From 154ee1156d62dd207aff0052b04c61796a1fde3b Mon Sep 17 00:00:00 2001
From: Ferry Huberts <ferry.huberts@pelagic.nl>
Date: Tue, 9 Mar 2021 22:04:46 +0100
Subject: [PATCH] Fix alignment compile errors on GCC 11

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
---
 src/blake2.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/blake2.h b/src/blake2.h
index b05208117e..b4398f9e13 100644
--- a/src/blake2.h
+++ b/src/blake2.h
@@ -57,7 +57,7 @@ extern "C" {
     uint8_t  personal[BLAKE2S_PERSONALBYTES];  // 32
   } blake2s_param;

-  JTR_ALIGN( 64 ) typedef struct __blake2s_state
+  typedef struct JTR_ALIGN( 64 ) __blake2s_state
   {
     uint32_t h[8];
     uint32_t t[2];
@@ -82,7 +82,7 @@ extern "C" {
     uint8_t  personal[BLAKE2B_PERSONALBYTES];  // 64
   } blake2b_param;

-  JTR_ALIGN( 64 ) typedef struct __blake2b_state
+  typedef struct JTR_ALIGN( 64 ) __blake2b_state
   {
     uint64_t h[8];
     uint64_t t[2];
@@ -94,7 +94,7 @@ extern "C" {
 #if defined(JOHN_NO_SIMD) || (!defined(__SSE2__) && !defined(__SSE4_1__) && !defined(__XOP__))
   typedef struct __blake2sp_state
 #else
-  JTR_ALIGN( 64 ) typedef struct __blake2sp_state
+  typedef struct JTR_ALIGN( 64 ) __blake2sp_state
 #endif
   {
     blake2s_state S[8][1];
@@ -106,7 +106,7 @@ extern "C" {
 #if defined(JOHN_NO_SIMD) || (!defined(__SSE2__) && !defined(__SSE4_1__) && !defined(__XOP__))
   typedef struct __blake2bp_state
 #else
-  JTR_ALIGN( 64 ) typedef struct __blake2bp_state
+  typedef struct JTR_ALIGN( 64 ) __blake2bp_state
 #endif
   {
     blake2b_state S[4][1];
packages/patches/libvirt-create-machine-cgroup.patch?id=a608666d74f156819cecfabaf72290726d7964e6'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/patches/libvirt-create-machine-cgroup.patch'>
<input type='hidden' name='id' value='a608666d74f156819cecfabaf72290726d7964e6'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=a608666d74f156819cecfabaf72290726d7964e6'>root</a>/<a href='/guix/log/gnu?id=a608666d74f156819cecfabaf72290726d7964e6'>gnu</a>/<a href='/guix/log/gnu/packages?id=a608666d74f156819cecfabaf72290726d7964e6'>packages</a>/<a href='/guix/log/gnu/packages/patches?id=a608666d74f156819cecfabaf72290726d7964e6'>patches</a>/<a href='/guix/log/gnu/packages/patches/libvirt-create-machine-cgroup.patch?id=a608666d74f156819cecfabaf72290726d7964e6'>libvirt-create-machine-cgroup.patch</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/patches/libvirt-create-machine-cgroup.patch?id=a608666d74f156819cecfabaf72290726d7964e6&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-11-05 15:13:14 +0100'>2019-11-05</span></td><td><a href='/guix/commit/gnu/packages/patches/libvirt-create-machine-cgroup.patch?id=aa1f0896fb15a0bdcc5474839c8afdbb2520d603'>gnu: libvirt: Update to 5.8.0.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/local.mk (dist_patch_DATA): Add new patch file.
* gnu/packages/patches/libvirt-create-machine-cgroup.patch: New patch,
submitted to upstream for upstream bug 1760233.
* gnu/packages/virtualization.scm (libvirt): Update version to 5.8.0.
Include patch.  Avoid execution of failing tests qemuxml2argvtest and
qemuhotplugtest.  Replace python by python-wrapper to avoid warnings on
patch-shebangs phase.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Miguel Ángel Arruga Vivas</td></tr>
* gnu/packages/chicken.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.

Signed-off-by: Julien Lepiller &lt;julien@lepiller.eu&gt;
</span></span></td><td>Ekaitz Zarraga</td></tr>