From: Mario Lang <mlang@blind.guru>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2 2/2] package/brltty: explicitly check if ioperm is available
Date: Fri, 29 Dec 2017 15:06:41 +0100 [thread overview]
Message-ID: <20171229140641.13882-2-mlang@blind.guru> (raw)
In-Reply-To: <20171229140641.13882-1-mlang@blind.guru>
ioperm, inb and outb are i386 specific functions usually
not available on non-PC archs. Check if ioperm is available before
trying to use it.
Patch cherry-picked from upstream, can be removed when 5.6 is out.
Fixes:
http://autobuild.buildroot.net/results/f09974f2ba24319e55e578ece34bb2e7e8bb3c43
http://autobuild.buildroot.net/results/7d502f280c46f0d1e2678140f9117fcc59bc2d7b
Signed-off-by: Mario Lang <mlang@blind.guru>
---
v2 fixes commit message and adds forgotten dependency on host-autoconf.
...operm-to-make-sure-the-platform-supports-.patch | 31 ++++++++++++++++++++++
package/brltty/brltty.mk | 8 +++++-
2 files changed, 38 insertions(+), 1 deletion(-)
create mode 100644 package/brltty/5.5/0002-Check-for-ioperm-to-make-sure-the-platform-supports-.patch
diff --git a/package/brltty/5.5/0002-Check-for-ioperm-to-make-sure-the-platform-supports-.patch b/package/brltty/5.5/0002-Check-for-ioperm-to-make-sure-the-platform-supports-.patch
new file mode 100644
index 0000000000..3dbacb3b57
--- /dev/null
+++ b/package/brltty/5.5/0002-Check-for-ioperm-to-make-sure-the-platform-supports-.patch
@@ -0,0 +1,31 @@
+From 28dde6749327fd15a1b8b7bcf5cc74a95598582a Mon Sep 17 00:00:00 2001
+From: Mario Lang <mlang@delysid.org>
+Date: Fri, 29 Dec 2017 10:35:05 +0100
+Subject: [PATCH] Check for ioperm to make sure the platform supports ports
+ I/O. (ml)
+
+Signed-off-by: Mario Lang <mlang@blind.guru>
+---
+This patch was taken from upstream, and can be removed when 5.6 is out.
+
+ configure.ac | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5e94d33bd..07119dd9f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1446,7 +1446,9 @@ BRLTTY_ARG_PACKAGE([ports], [I/O ports], [], [dnl
+ ports_package="kfreebsd"
+ ;;
+ linux*)
+- ports_package="glibc"
++ AC_CHECK_FUNC([ioperm], [
++ ports_package="glibc"
++ ])
+ ;;
+ mingw*)
+ ports_package="windows"
+--
+2.15.0
+
diff --git a/package/brltty/brltty.mk b/package/brltty/brltty.mk
index 9621d4f9c1..16d804dabf 100644
--- a/package/brltty/brltty.mk
+++ b/package/brltty/brltty.mk
@@ -11,7 +11,7 @@ BRLTTY_INSTALL_STAGING_OPTS = INSTALL_ROOT=$(STAGING_DIR) install
BRLTTY_INSTALL_TARGET_OPTS = INSTALL_ROOT=$(TARGET_DIR) install
BRLTTY_LICENSE_FILES = LICENSE-GPL LICENSE-LGPL
-BRLTTY_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
+BRLTTY_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-autoconf
BRLTTY_CONF_OPTS = \
--disable-java-bindings \
@@ -24,6 +24,12 @@ BRLTTY_CONF_OPTS = \
--without-mikropuhe --without-speechd --without-swift \
--without-theta --without-viavoice
+define BRLTTY_AUTOCONF
+ cd $(BRLTTY_SRCDIR) && $(AUTOCONF)
+endef
+
+BRLTTY_PRE_CONFIGURE_HOOKS += BRLTTY_AUTOCONF
+
ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y)
BRLTTY_DEPENDENCIES += bluez5_utils
BRLTTY_CONF_OPTS += --with-bluetooth-package
--
2.15.0
next prev parent reply other threads:[~2017-12-29 14:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-29 14:06 [Buildroot] [PATCH v2 1/2] package/brltty: avoid spurious log messages while decoding scancodes Mario Lang
2017-12-29 14:06 ` Mario Lang [this message]
2017-12-29 16:19 ` [Buildroot] [PATCH v2 2/2] package/brltty: explicitly check if ioperm is available Thomas Petazzoni
2017-12-29 19:22 ` Mario Lang
2017-12-29 19:54 ` Thomas Petazzoni
2017-12-29 20:59 ` Thomas Petazzoni
2017-12-29 20:56 ` [Buildroot] [PATCH v2 1/2] package/brltty: avoid spurious log messages while decoding scancodes Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171229140641.13882-2-mlang@blind.guru \
--to=mlang@blind.guru \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox