diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2018-05-28 21:18:43 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2018-05-29 11:10:42 -0400 |
| commit | e1ec62c46a0be4c40414df02f9b6fccfca94006e (patch) | |
| tree | abf63f0d50d6c724e90511f8baf4c4a9971b03b4 /libre/libutil-linux-static/0001-fstrim-cleanup-uncludes.patch | |
| parent | 06f09684205a5674088113b098f5fd2a6176772c (diff) | |
| download | abslibre-e1ec62c46a0be4c40414df02f9b6fccfca94006e.tar.gz abslibre-e1ec62c46a0be4c40414df02f9b6fccfca94006e.tar.bz2 abslibre-e1ec62c46a0be4c40414df02f9b6fccfca94006e.zip | |
Update libre/qemu-user-static and dependencies
Fighting with glib2 was no fun. But hey, at least I got a GCC bug report
out of it! https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85957
To get around this, I enabled SSE2 for glib2-static. This means it won't
run on pre-Pentium 4 (2001) i686 processors; which will cause problems on
the Pentium Pro/2 and the Pentium 3, and their AMD competitors: K6 and K7
(the latter of which was branded as Athlon, Athlon XP, Duron, and Sempron).
https://lists.parabola.nu/pipermail/dev/2018-May/006748.html
If someone digs out a Pentium 2 and gets Parabola to boot on it, I'll
figure out a different way to get around glib2's disagreement with x87
floating point math; and turn SSE2 back off.
Diffstat (limited to 'libre/libutil-linux-static/0001-fstrim-cleanup-uncludes.patch')
| -rw-r--r-- | libre/libutil-linux-static/0001-fstrim-cleanup-uncludes.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/libre/libutil-linux-static/0001-fstrim-cleanup-uncludes.patch b/libre/libutil-linux-static/0001-fstrim-cleanup-uncludes.patch new file mode 100644 index 000000000..74078555f --- /dev/null +++ b/libre/libutil-linux-static/0001-fstrim-cleanup-uncludes.patch @@ -0,0 +1,41 @@ +From 43abda66869e749044c6c4fd1d106d7df9484aca Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Thu, 22 Mar 2018 13:17:10 +0100 +Subject: fstrim: cleanup includes + +* HAVE_SYS_FS_H is incorrect (should be HAVE_LINUX_FS_H) + +* linux/fs.h cannot be included together with sys/mount.h as the both + files define MS_* constants. The libmount.h includes sys/mount.h now. + +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + sys-utils/fstrim.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/sys-utils/fstrim.c b/sys-utils/fstrim.c +index ca8cf256d..53ac594c0 100644 +--- a/sys-utils/fstrim.c ++++ b/sys-utils/fstrim.c +@@ -36,10 +36,6 @@ + #include <sys/ioctl.h> + #include <sys/stat.h> + +-#ifdef HAVE_SYS_FS_H +-# include <linux/fs.h> +-#endif +- + #include "nls.h" + #include "strutils.h" + #include "c.h" +@@ -49,6 +45,10 @@ + + #include <libmount.h> + ++ ++/* We cannot include linux/fs.h due to MS_* constants collision with ++ * sys/mount.h (and libmount.h) ++ */ + #ifndef FITRIM + struct fstrim_range { + uint64_t start; |