Commit graph

18 commits

Author SHA1 Message Date
Fabrice Fontaine 899ab0d63c package/brltty: fix build with expat
tbl2hex is a host command line that is built with:

$(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $(TBL2HEX_OBJECTS) $(EXPAT_LIBS_FOR_BUILD) $(LDLIBS_FOR_BUILD)

It needs cldr.o which can depends on expat and is built through:

%.$B: $(SRC_DIR)/%.c
       $(CC_FOR_BUILD) -DFOR_BUILD $(CFLAGS_FOR_BUILD) -o $@ -c $<

When cross-compiling, build fails because expat is not found on host:

gcc -DFOR_BUILD -I. -I. -I./../Programs -I../Programs -I../Headers -I./.. -I.. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=2 -D_BSD_SOURCE -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_GNU_SOURCE  -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=2 -D_BSD_SOURCE -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_GNU_SOURCE -DHAVE_CONFIG_H -g -O2 -std=gnu99 -Wall -Werror=format-security -o cldr.build.o -c cldr.c
cldr.c:31:10: fatal error: expat.h: No such file or directory
 #include <expat.h>
          ^~~~~~~~~

To fix this issue, add host-expat dependency as well as patch so that
the *_FOR_BUILD variables are properly passed to the sub-configure
script that brltty runs to build the host utilities.

Fixes:
 - http://autobuild.buildroot.org/results/362cfb57e4a91a066493269d8078d931529ddf69

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Thomas: use a different, simpler solution.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-10-26 14:56:34 +02:00
Fabrice Fontaine 6fe9779dbc package/brltty: add pcre optional dependency
pcre/pcre2 has been added in version 6.0 with:
- 579cae458a
- e7f36c00db

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-09-28 22:46:30 +02:00
Fabrice Fontaine def0f8d134 package/brltty: add expat optional dependency
expat optional dependency has been added in version 6.0 with
a37febee8c

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-09-28 22:46:18 +02:00
Fabrice Fontaine 94a65927b2 package/brltty: bump to version 6.0
- Remove first patch (already in version)
- Update hash of README: small updates in year, version
- Remove --without-viavoice option (not available anymore)
- Disable espeak-ng (not available in buildroot yet)

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-09-28 22:46:13 +02:00
Fabrice Fontaine 9143c21721 brltty: use gcc instead of ld to link shared objects
Bump to version 5.6 has reintroduced the issue fixed by patch 854093 on
version 5.5.

Indeed, third patch was merged upstream but it was then reverted:
9e7d62c869

Moreover, since commit 3a2e3f6fa5ef0a210ffeba5ed05c79965d0cc3c7, MKOBJ
was renamed into MKREL. So, patch again brltty, overwrite
MKREL to use "gcc -shared -o" instead of "ld -r -o" if gcc is available
(as suggested by Arnout: https://patchwork.ozlabs.org/patch/972614).

Fixes:
 - http://autobuild.buildroot.org/results/31f682838b3d3b2c7103b5c51f2aba0b89d4f630

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-10-09 08:53:09 +02:00
Fabrice Fontaine 50f42f1c09 brltty: bump to version 5.6
- Remove first, second and third patch (already in version)
- Fix major/minor build failure with glibc 2.28, see:
  cee581fac7
- Update web site URL to brltty.app, see
  97efaecd6c
- Update license to LPGL-2.1+, see:
  16ccb7d13f

Fixes:
 - http://autobuild.buildroot.org/results/0fb2c33f00990e471736c4180f23026fa9adb982

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-09-18 22:29:16 +02:00
Fabrice Fontaine ecf832704b brltty: add license
brltty 5.5 is licensed under GPL-2.0+ with exceptions in LGPL-2.1+ for
data and client side as specified in README so add this information in
BRLTTY_LICENSE, update BRLTTY_LICENSE_FILES and add hash for README

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-09-18 22:28:43 +02:00
Yann E. MORIN 8909897ab3 package/brltty: fix cross-compilation
brltty has a very inventive buildsystem, where it internall runs
./configure for the build machine In doing so, it generates a list
of make variables to define what the build machine supports, like
it does for the target.

However, the build variables are generated with a convoluted sed
script that scans the target list, and appends _FOR_BUILD to each
target variables. Then, both lists are included from the Makefile,
on the assumption that the build variables will not clash with the
target variables.

Where it gets interesting, is that that sed script considers the
variables names to match '[A-Za-z][A-Za-z0-9_]*'

And there we see why ATSPI2_PACKAGE does not match: it contains a
digit.

So, some build variables will inevitably override target ones.

Fix that by simply expanding the matching regexp to allow digits
in variable names.

Fixes:
    http://autobuild.buildroot.org/results/a37/a37782b3cfc1a96cc129db8fade20a36a7b2d470/
    http://autobuild.buildroot.org/results/97e/97edc6a47d2140968e84b409cdc960604e5896f2/

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Mario Lang <mlang@blind.guru>
Cc: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-08-25 14:39:54 +02:00
Fabrice Fontaine 8d91fc17cd brltty: add optional at-spi2-core dependency
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2018-07-10 22:05:13 +02:00
Mario Lang 0344e6b3dd package/brltty: depends on BR2_USE_MMU due to calls to fork()
Fixes:
  http://autobuild.buildroot.net/results/489dd7a19911b45ae7b0f1eade63def793e03ade

Signed-off-by: Mario Lang <mlang@blind.guru>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2018-01-01 23:04:14 +01:00
Mario Lang 391efec78a package/brltty: depends on !BR2_STATIC_LIBS
This requirement is likely to go away in the future.  However, declaring
this fact explicitly for now fixes a number of test-pkg failures.

Signed-off-by: Mario Lang <mlang@blind.guru>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-12-30 18:10:23 +01:00
Mario Lang 97352f8957 package/brltty: use gcc instead of ld to link shared objects
Fixes:
  http://autobuild.buildroot.net/results/2419741c43dea0f91859c19167c8d65cb54e1470
  http://autobuild.buildroot.net/results/4b83e53c718520661dc99cde2121f69ce3fd08d7

Signed-off-by: Mario Lang <mlang@blind.guru>
[Thomas: add reference to upstream commit, as suggested by Yann.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-12-30 18:09:40 +01:00
Mario Lang d6d4deb64f package/brltty: add missing dependency on host-pkgconf
This fixes the following error:
  ./configure: line 14978: .../host/bin/pkg-config: No such file or directory

Signed-off-by: Mario Lang <mlang@blind.guru>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-12-30 13:22:15 +01:00
Mario Lang ee8309e287 package/brltty: explicitly check if ioperm is available
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>
[Thomas: move patch out of per-version directory, add comment
explaining why we need to autoreconf, and why we can't use
<pkg>_AUTORECONF.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-12-29 21:48:24 +01:00
Mario Lang 6ac0abfca8 package/brltty: avoid spurious log messages while decoding scancodes
Patch cherry-picked from upstream, can be removed upon next release.

Signed-off-by: Mario Lang <mlang@blind.guru>
[Thomas: move patch out of per-version directory.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-12-29 21:36:16 +01:00
Mario Lang 0af9bb7f1a package/brltty: disable X11 support for now
This stops xbrlapi from building/installing, which is really not essential
to almost all users.

Fixes:
  http://autobuild.buildroot.net/results/3fe2d053dcfdf5af791e9127f3e9f1dceaabfdc0
  http://autobuild.buildroot.net/results/6cfa5e9d37ac1571dc58df538232bb9e1749e62a

Signed-off-by: Mario Lang <mlang@blind.guru>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-12-21 16:30:16 +01:00
Mario Lang e9de1bde60 package/brltty: disable features and add optional dependencies
* --without-midi-package should fix a number of autobuild failures.
* Disable a number of speech drivers to avoid build failures
  if they are installed on the host.
* Optional dependency on espeak and flite fixes builds where
  espeak or flite are installed on the host.

Fixes:

  http://autobuild.buildroot.net/results/0c4f557c2ad276b1ed065119532af37c0af5f014
  http://autobuild.buildroot.net/results/ea82b7c7732821368746ddddb5d529e97c9b6c16

Signed-off-by: Mario Lang <mlang@blind.guru>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-12-18 15:55:21 +01:00
Mario Lang 679585bd61 brltty: new package
Signed-off-by: Mario Lang <mlang@blind.guru>
[Thomas:
 - wrap too long CONF_OPTS line that disables all the language
   bindings
 - use an intermediate BRLTTY_TEXT_TABLE variable to store the
   qstripped version of BR2_PACKAGE_BRLTTY_TEXT_TABLE.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-12-17 11:21:54 +01:00