summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorIsmael Luceno2021-09-09 18:24:00 +0200
committerIsmael Luceno2021-09-09 18:24:29 +0200
commit13d1b385aacf344f3ee9d4e8ba294276a0f5adb0 (patch)
tree4af3d43162acd5bfca56fbde710255201b3a28fb /utils
parenta241f5762b7e999a6a81275e05103e43320f16c9 (diff)
qemu: Fix musl syscall.c patch for glibc
Diffstat (limited to 'utils')
-rw-r--r--utils/qemu/HISTORY3
-rw-r--r--utils/qemu/patches/musl-fix-duplicated-sysinfo.patch4
2 files changed, 6 insertions, 1 deletions
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index d548c232ee..b280831231 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,6 @@
+2021-09-09 Ismael Luceno <ismael@sourcemage.org>
+ * patches/musl-fix-duplicated-sysinfo.patch: fixed for glibc
+
2020-09-07 Ismael Luceno <ismael@sourcemage.org>
* DETAILS: updated spell to 5.1.0
TMPFS=OFF
diff --git a/utils/qemu/patches/musl-fix-duplicated-sysinfo.patch b/utils/qemu/patches/musl-fix-duplicated-sysinfo.patch
index dbe8c17df6..f81fa20769 100644
--- a/utils/qemu/patches/musl-fix-duplicated-sysinfo.patch
+++ b/utils/qemu/patches/musl-fix-duplicated-sysinfo.patch
@@ -1,10 +1,12 @@
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
-@@ -16,5 +16,6 @@
+@@ -16,6 +16,9 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#define _ATFILE_SOURCE
++#ifndef __GLIBC__
+#define _LINUX_SYSINFO_H /* to avoid duplicated sysinfo struct definition */
++#endif
#include "qemu/osdep.h"
#include "qemu/cutils.h"
#include "qemu/path.h"