Copied from Debian.

2017-06-14  Florian Weimer  <fweimer@redhat.com>

	* sysdeps/i386/i686/multiarch/strcspn-c.c: Add IS_IN (libc) guard.
	* sysdeps/i386/i686/multiarch/varshift.c: Likewise.

--- a/sysdeps/i386/i686/multiarch/strcspn-c.c
+++ b/sysdeps/i386/i686/multiarch/strcspn-c.c
@@ -1,2 +1,4 @@
-#define __strcspn_sse2 __strcspn_ia32
-#include <sysdeps/x86_64/multiarch/strcspn-c.c>
+#if IS_IN (libc)
+# define __strcspn_sse2 __strcspn_ia32
+# include <sysdeps/x86_64/multiarch/strcspn-c.c>
+#endif
--- a/sysdeps/i386/i686/multiarch/varshift.c
+++ b/sysdeps/i386/i686/multiarch/varshift.c
@@ -1 +1,3 @@
-#include <sysdeps/x86_64/multiarch/varshift.c>
+#if IS_IN (libc)
+# include <sysdeps/x86_64/multiarch/varshift.c>
+#endif
lect name='h' onchange='this.form.submit();'>
<option value='koszko' selected='selected'>koszko</option>
<option value='koszko-scripts'>koszko-scripts</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=cdffb73c04d0c68d7edf19ee02fc3a554dea04bc'>refs</a><a class='active' href='/guix/log/gnu/packages/patches/libvirt-create-machine-cgroup.patch'>log</a><a href='/guix/tree/gnu/packages/patches/libvirt-create-machine-cgroup.patch?id=cdffb73c04d0c68d7edf19ee02fc3a554dea04bc'>tree</a><a href='/guix/commit/gnu/packages/patches/libvirt-create-machine-cgroup.patch?id=cdffb73c04d0c68d7edf19ee02fc3a554dea04bc'>commit</a><a href='/guix/diff/gnu/packages/patches/libvirt-create-machine-cgroup.patch?id=cdffb73c04d0c68d7edf19ee02fc3a554dea04bc'>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='cdffb73c04d0c68d7edf19ee02fc3a554dea04bc'/><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=cdffb73c04d0c68d7edf19ee02fc3a554dea04bc'>root</a>/<a href='/guix/log/gnu?id=cdffb73c04d0c68d7edf19ee02fc3a554dea04bc'>gnu</a>/<a href='/guix/log/gnu/packages?id=cdffb73c04d0c68d7edf19ee02fc3a554dea04bc'>packages</a>/<a href='/guix/log/gnu/packages/patches?id=cdffb73c04d0c68d7edf19ee02fc3a554dea04bc'>patches</a>/<a href='/guix/log/gnu/packages/patches/libvirt-create-machine-cgroup.patch?id=cdffb73c04d0c68d7edf19ee02fc3a554dea04bc'>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=cdffb73c04d0c68d7edf19ee02fc3a554dea04bc&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>