[Aboriginal] 1.4.4 is out.

Laurent Bercot ska-devel at skarnet.org
Fri Jan 8 08:50:53 PST 2016


On 08/01/2016 17:39, Rob Landley wrote:
> So have I, but the native builds of strace and linux from scratch are
> still broken.

  Just in case you still don't have the patch for strace-4.10 and
didn't rewrite it yourself: here it is.

-- 
  Laurent

From: Felix Janda <felix.janda at posteo.de>
Date: Sat, 28 Mar 2015 18:40:13 +0100
Subject: [PATCH] Include <linux/ioctl.h> for _IOC_* macros

Fix a compilation failure with musl libc.

* evdev.c: Include <linux/ioctl.h>.
* ioctl.c: Include <linux/ioctl.h> instead of <asm/ioctl.h>.
* ioctlsort.c: Likewise.

Reported-by: Dima Krasner <dima at dimakrasner.com>
Acked-by: Mike Frysinger <vapier at gentoo.org>
---
  evdev.c     | 2 ++
  ioctl.c     | 2 +-
  ioctlsort.c | 2 +-
  3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/evdev.c b/evdev.c
index 9a7430d..e06f9c1 100644
--- a/evdev.c
+++ b/evdev.c
@@ -28,6 +28,8 @@

  #include "defs.h"

+#include <linux/ioctl.h>
+
  #ifdef HAVE_LINUX_INPUT_H
  #include <linux/input.h>
  #include "xlat/evdev_abs.h"
diff --git a/ioctl.c b/ioctl.c
index 46f8334..c67d048 100644
--- a/ioctl.c
+++ b/ioctl.c
@@ -29,7 +29,7 @@
   */

  #include "defs.h"
-#include <asm/ioctl.h>
+#include <linux/ioctl.h>
  #include "xlat/ioctl_dirs.h"

  #ifdef HAVE_LINUX_INPUT_H
diff --git a/ioctlsort.c b/ioctlsort.c
index 333556c..9c31691 100644
--- a/ioctlsort.c
+++ b/ioctlsort.c
@@ -33,7 +33,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-#include <asm/ioctl.h>
+#include <linux/ioctl.h>

  struct ioctlent {
         const char *info;
--
1.9.1


 1452271853.0


More information about the Aboriginal mailing list