| Message ID | 20171229140641.13882-2-mlang@blind.guru |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2,1/2] package/brltty: avoid spurious log messages while decoding scancodes | expand |
Hello, On Fri, 29 Dec 2017 15:06:41 +0100, Mario Lang wrote: > +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" This seems weird. What happens then when ioperm() is not available ? Which ports_package is used ? > -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 Please use BRLTTY_AUTORECONF = YES instead. Thanks! Thomas
Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: > Hello, > > On Fri, 29 Dec 2017 15:06:41 +0100, Mario Lang wrote: > >> +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" > > This seems weird. What happens then when ioperm() is not available ? > Which ports_package is used ? "none", which is exactly what we want. Patch already accepted by upstream. The "ports package" is to support Braille displays connected via the parallel port, which basically no longer exist these days. All relevant models work via USB, Bluetooth or plain serial ports these days. >> -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 > > Please use BRLTTY_AUTORECONF = YES instead. brltty doesn't work with autoreconf. It has its own autogen script, which basically does some dependency calculations (with tcl, a dep I'd like to avoid) and a plain autoconf. So I copied that behaviour, since autoreconf fails with problems about autoheaders.
Hello, On Fri, 29 Dec 2017 20:22:22 +0100, Mario Lang wrote: > > This seems weird. What happens then when ioperm() is not available ? > > Which ports_package is used ? > > "none", which is exactly what we want. Patch already accepted by upstream. > The "ports package" is to support Braille displays connected via the > parallel port, which basically no longer exist these days. All relevant > models work via USB, Bluetooth or plain serial ports these days. > > >> -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 > > > > Please use BRLTTY_AUTORECONF = YES instead. > > brltty doesn't work with autoreconf. It has its own autogen script, > which basically does some dependency calculations (with tcl, a dep I'd > like to avoid) and a plain autoconf. So I copied that behaviour, since > autoreconf fails with problems about autoheaders. OK, thanks for those explanations! Thomas
Hello, On Fri, 29 Dec 2017 15:06:41 +0100, Mario Lang wrote: > 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. Like for PATCH 1/2, I've moved the patch back into package/brltty/, since a per-version sub-directory is not needed. I've also added a comment in the .mk file about why we're doing autoconf, and not an autoreconf. Best regards, Thomas
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
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