From 5a2844c74815976d32265395b4b3836fdab786a0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 15 Mar 2010 15:14:56 +0100 Subject: [PATCH] setserial: fix build with 2.6.33+ kernel headers on x86 linux/hayesesp.h got removed in 2.6.33, but some archs (like x86) still define the TIOCGHAYESESP ioctl, breaking the build. It's very unlikely to be of interest anymore, so just undef it. Reported-by: Paulius Zaleckas Signed-off-by: Peter Korsgaard --- CHANGES | 2 +- .../setserial-tiocghayesesp-build-fix.patch | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 package/setserial/setserial-tiocghayesesp-build-fix.patch diff --git a/CHANGES b/CHANGES index f1edd164e5..dce7efb315 100644 --- a/CHANGES +++ b/CHANGES @@ -6,7 +6,7 @@ X.org updated to 7.5. Updated/fixed packages: busybox, dosfstools, e2fsprogs, - mtd-utils, squashfs + mtd-utils, setserial, squashfs Issues resolved (http://bugs.uclibc.org): diff --git a/package/setserial/setserial-tiocghayesesp-build-fix.patch b/package/setserial/setserial-tiocghayesesp-build-fix.patch new file mode 100644 index 0000000000..176a0c9e15 --- /dev/null +++ b/package/setserial/setserial-tiocghayesesp-build-fix.patch @@ -0,0 +1,28 @@ +[PATCH] setserial: fix build with 2.6.33+ kernel headers + +linux/hayesesp.h got removed in 2.6.33, but some archs (like x86) still +define the TIOCGHAYESESP ioctl, breaking the build. + +It's very unlikely to be of interest anymore, so just undef it. + +Signed-off-by: Peter Korsgaard +--- + setserial.c | 5 +++++ + 1 file changed, 5 insertions(+) + +Index: setserial-2.17/setserial.c +=================================================================== +--- setserial-2.17.orig/setserial.c ++++ setserial-2.17/setserial.c +@@ -24,6 +24,11 @@ + #endif + #include + ++/* linux/hayesesp.h got removed in 2.6.33 but some archs (like x86) ++ still define TIOCGHAYESESP. It's very unlikely to be of interest ++ anymore, so just undef it */ ++#undef TIOCGHAYESESP ++ + #include "version.h" + + static char version_str[] = "setserial version " SETSERIAL_VERSION ", " -- 2.30.2