package/brltty: add missing dependency on host-pkgconf
PATCH 1/3 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
--- package/brltty/brltty.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/brltty/brltty.mk +1 -1
@@ -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) host-autoconf +BRLTTY_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-autoconf host-pkgconf BRLTTY_CONF_OPTS = \ --disable-java-bindings \
Signature · 1 line
2.15.0
PATCH 2/3 package/brltty: use gcc instead of ld to link shared objects
Fixes:
http://autobuild.buildroot.net/results/2419741c43dea0f91859c19167c8d65cb54e1470
http://autobuild.buildroot.net/results/4b83e53c718520661dc99cde2121f69ce3fd08d7
--- .../0003-Remove-MKOBJ-in-favour-of-MKMOD.patch | 63 ++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 package/brltty/0003-Remove-MKOBJ-in-favour-of-MKMOD.patch
package/brltty/0003-Remove-MKOBJ-in-favour-of-MKMOD.patch new file +63 -0
@@ -0,0 +1,63 @@ +From b3b0e47015e9162f519730789976157c7cc38178 Mon Sep 17 00:00:00 2001 +From: Mario Lang <[email protected]> +Date: Fri, 29 Dec 2017 14:52:37 +0100 +Subject: [PATCH] Remove MKOBJ in favour of MKMOD. (ml) + +Calling ld directly can lead to problems when cross-compiling. + +Signed-off-by: Mario Lang <[email protected]> +--- + Drivers/Braille/EuroBraille/Makefile.in | 2 +- + config.mk.in | 1 - + configure.ac | 10 ---------- + 3 files changed, 1 insertion(+), 12 deletions(-) + +diff --git a/Drivers/Braille/EuroBraille/Makefile.in b/Drivers/Braille/EuroBraille/Makefile.in +index 0500aa70e..ce8a3d1a4 100644 +--- a/Drivers/Braille/EuroBraille/Makefile.in ++++ b/Drivers/Braille/EuroBraille/Makefile.in +@@ -28,7 +28,7 @@ SRC_FILES = eu_braille.c eu_clio.c eu_esysiris.c + OBJ_FILES = $(SRC_FILES:.c=.$O) + + braille.$O: $(OBJ_FILES) +- $(MKOBJ) $@ $(OBJ_FILES) ++ $(MKMOD) $@ $(OBJ_FILES) + + %.$O: $(SRC_DIR)/%.c + $(CC) $(BRL_CFLAGS) -o $@ -c $< +diff --git a/config.mk.in b/config.mk.in +index 686f547e6..8d1da79b4 100644 +--- a/config.mk.in ++++ b/config.mk.in +@@ -250,7 +250,6 @@ LD = @LD@ + LDFLAGS = @LDFLAGS@ + LDLIBS = $(ICU_LIBS) $(POLKIT_LIBS) $(SYSTEM_LIBS) @LIBS@ + +-MKOBJ = @MKOBJ@ + MKMOD = @MKMOD@ + MKLIB = @MKLIB@ + CONFLIBDIR = @CONFLIBDIR@ +diff --git a/configure.ac b/configure.ac +index 07119dd9f..ad80b8d60 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -428,16 +428,6 @@ AC_SUBST([can_make_manual]) + test "${DOXYGEN}" = "false" && can_make_BrlAPIref=no || can_make_BrlAPIref=yes + AC_SUBST([can_make_BrlAPIref]) + +-AC_CACHE_CHECK([for make relocatable object command], [brltty_cv_prog_mkobj], [dnl +-case "${host_os}" +-in +- *) +- brltty_cv_prog_mkobj="\$(LD) -r -o" +- ;; +-esac]) +-MKOBJ="${brltty_cv_prog_mkobj}" +-AC_SUBST([MKOBJ]) +- + AC_CACHE_CHECK([for loadable module creation command], [brltty_cv_prog_mkmod], [dnl + case "${host_os}" + in +-- +2.15.0 +
Signature · 1 line
2.15.0
PATCH 2/3 package/brltty: use gcc instead of ld to link shared objects
Mario, All,
On 2017-12-30 11:48 +0100, Mario Lang spake thusly:
Quoted 15 lines
Fixes:
http://autobuild.buildroot.net/results/2419741c43dea0f91859c19167c8d65cb54e1470
http://autobuild.buildroot.net/results/4b83e53c718520661dc99cde2121f69ce3fd08d7Signed-off-by Mario Lang <[email protected]>--- .../0003-Remove-MKOBJ-in-favour-of-MKMOD.patch | 63 ++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 package/brltty/0003-Remove-MKOBJ-in-favour-of-MKMOD.patchpackage/brltty/0003-Remove-MKOBJ-in-favour-of-MKMOD.patch new file +0
-0
package/brltty/0003-Remove-MKOBJ-in-favour-of-MKMOD.patch line 6
Quoted 6 lines
package/brltty/0003-Remove-MKOBJ-in-favour-of-MKMOD.patch new file +6
-0@@ -0,0 +1,63 @@ +From b3b0e47015e9162f519730789976157c7cc38178 Mon Sep 17 00:00:00 2001 +From: Mario Lang <[email protected]> +Date: Fri, 29 Dec 2017 14:52:37 +0100 +Subject: [PATCH] Remove MKOBJ in favour of MKMOD. (ml) + +Calling ld directly can lead to problems when cross-compiling.
Since this is a backport of an upstream commit, we like to have a pointer to the upstream commit:
https://github.com/brltty/brltty/commit/4c8aba42e246b96d10ffcbd57653682375499e46
Also, since you are patching configure.ac, you must autoreconf:
BRLTTY_AUTORECONF = YES
However, as a backport for Buildroot, I would just keep the diff about Drivers/Braille/EuroBraille/Makefile.in and drop the rest of the diff, which would no longer require running autoreconf.
Regards,
Yann E. MORIN.
Quoted 63 lines
package/brltty/0003-Remove-MKOBJ-in-favour-of-MKMOD.patch new file +56
-0+Signed-off-by: Mario Lang <[email protected]> +--- + Drivers/Braille/EuroBraille/Makefile.in | 2 +- + config.mk.in | 1 - + configure.ac | 10 ---------- + 3 files changed, 1 insertion(+), 12 deletions(-) + +diff --git a/Drivers/Braille/EuroBraille/Makefile.in b/Drivers/Braille/EuroBraille/Makefile.in +index 0500aa70e..ce8a3d1a4 100644 +--- a/Drivers/Braille/EuroBraille/Makefile.in ++++ b/Drivers/Braille/EuroBraille/Makefile.in +@@ -28,7 +28,7 @@ SRC_FILES = eu_braille.c eu_clio.c eu_esysiris.c + OBJ_FILES = $(SRC_FILES:.c=.$O) + + braille.$O: $(OBJ_FILES) +- $(MKOBJ) $@ $(OBJ_FILES) ++ $(MKMOD) $@ $(OBJ_FILES) + + %.$O: $(SRC_DIR)/%.c + $(CC) $(BRL_CFLAGS) -o $@ -c $< +diff --git a/config.mk.in b/config.mk.in +index 686f547e6..8d1da79b4 100644 +--- a/config.mk.in ++++ b/config.mk.in +@@ -250,7 +250,6 @@ LD = @LD@ + LDFLAGS = @LDFLAGS@ + LDLIBS = $(ICU_LIBS) $(POLKIT_LIBS) $(SYSTEM_LIBS) @LIBS@ + +-MKOBJ = @MKOBJ@ + MKMOD = @MKMOD@ + MKLIB = @MKLIB@ + CONFLIBDIR = @CONFLIBDIR@ +diff --git a/configure.ac b/configure.ac +index 07119dd9f..ad80b8d60 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -428,16 +428,6 @@ AC_SUBST([can_make_manual]) + test "${DOXYGEN}" = "false" && can_make_BrlAPIref=no || can_make_BrlAPIref=yes + AC_SUBST([can_make_BrlAPIref]) + +-AC_CACHE_CHECK([for make relocatable object command], [brltty_cv_prog_mkobj], [dnl +-case "${host_os}" +-in +- *) +- brltty_cv_prog_mkobj="\$(LD) -r -o" +- ;; +-esac]) +-MKOBJ="${brltty_cv_prog_mkobj}" +-AC_SUBST([MKOBJ]) +- + AC_CACHE_CHECK([for loadable module creation command], [brltty_cv_prog_mkmod], [dnl + case "${host_os}" + in +-- +2.15.0 +Signature · 6 lines
2.15.0 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 2/3 package/brltty: use gcc instead of ld to link shared objects
Quoted 28 lines · Yann E. MORIN
Mario, All,
On 2017-12-30 11:48 +0100, Mario Lang spake thusly:
Quoted 15 lines
Fixes:
http://autobuild.buildroot.net/results/2419741c43dea0f91859c19167c8d65cb54e1470
http://autobuild.buildroot.net/results/4b83e53c718520661dc99cde2121f69ce3fd08d7Signed-off-by Mario Lang <[email protected]>--- .../0003-Remove-MKOBJ-in-favour-of-MKMOD.patch | 63 ++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 package/brltty/0003-Remove-MKOBJ-in-favour-of-MKMOD.patchpackage/brltty/0003-Remove-MKOBJ-in-favour-of-MKMOD.patch new file +0
-0package/brltty/0003-Remove-MKOBJ-in-favour-of-MKMOD.patch line 6
Quoted 6 lines
package/brltty/0003-Remove-MKOBJ-in-favour-of-MKMOD.patch new file +6
-0@@ -0,0 +1,63 @@ +From b3b0e47015e9162f519730789976157c7cc38178 Mon Sep 17 00:00:00 2001 +From: Mario Lang <[email protected]> +Date: Fri, 29 Dec 2017 14:52:37 +0100 +Subject: [PATCH] Remove MKOBJ in favour of MKMOD. (ml) + +Calling ld directly can lead to problems when cross-compiling.Since this is a backport of an upstream commit, we like to have a pointer to the upstream commit:
OK, sorry. Was not aware of that. Can you add this to the commit log, or should I resend the patch?
Quoted 7 lines
Also, since you are patching configure.ac, you must autoreconf:
BRLTTY_AUTORECONF= YESHowever, as a backport for Buildroot, I would just keep the diff about Drivers/Braille/EuroBraille/Makefile.in and drop the rest of the diff, which would no longer require running autoreconf.
We already do the equivalent of autoreconf. BRLTTY_AUTORECONF = YES does not work with BRLTTY, as BRLTTY is a autoconf-only package. Please see the comment added by Thomas in brltty.mk:
# Autoreconf is needed because we're patching configure.ac in
# 0002-Check-for-ioperm-to-make-sure-the-platform-supports-.patch. However,
# a plain autoreconf doesn't work, because this package is only # autoconf-based.
Signature · 2 lines
CYa, ?????
PATCH 2/3 package/brltty: use gcc instead of ld to link shared objects
Mario, All,
On 2017-12-30 15:32 +0100, Mario Lang spake thusly:
Quoted 6 lines
Quoted 3 lines · Yann E. MORIN
Since this is a backport of an upstream commit, we like to have a pointer to the upstream commit:
https://github.com/brltty/brltty/commit/4c8aba42e246b96d10ffcbd57653682375499e46OK, sorry. Was not aware of that. Can you add this to the commit log, or should I resend the patch?
[--SNIP--]
Quoted 2 lines
Quoted 2 lines
Also, since you are patching configure.ac, you must autoreconf:
BRLTTY_AUTORECONF= YES
[--SNIP--]
Quoted 3 lines
We already do the equivalent of autoreconf.
BRLTTY_AUTORECONF= YES does not work with BRLTTY, as BRLTTY is a autoconf-only package. Please see the comment added by Thomas in brltty.mk:
Ah, I did not have an up-to-date master branch. I pulled and now I can see it, indeed.
So, since we already need to autoconf, we can keep your patch as-is.
I guess whoever applies your patch can add the URL to the patch commit log, yes, so I would say no need to resend.
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
Thomas Petazzoni
AppliedPATCH 2/3 package/brltty: use gcc instead of ld to link shared objects
In reply to Mario LangHello,
Quoted 8 lines · Mario Lang
Fixes:
http://autobuild.buildroot.net/results/2419741c43dea0f91859c19167c8d65cb54e1470
http://autobuild.buildroot.net/results/4b83e53c718520661dc99cde2121f69ce3fd08d7Signed-off-by Mario Lang <[email protected]>--- .../0003-Remove-MKOBJ-in-favour-of-MKMOD.patch | 63 ++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 package/brltty/0003-Remove-MKOBJ-in-favour-of-MKMOD.patch
Applied to master after adding a reference to the upstream commit, as suggested by Yann. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 3/3 package/brltty: depends on !BR2_STATIC_LIBS
In reply to Mario LangThis requirement is likely to go away in the future. However, declaring this fact explicitly for now fixes a number of test-pkg failures.
--- package/brltty/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
package/brltty/Config.in +3 -2
@@ -2,6 +2,7 @@ config BR2_PACKAGE_BRLTTY bool "brltty" depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS help A daemon providing access to the Linux console for a blind person using a refreshable braille display.
@@ -15,5 +16,5 @@ config BR2_PACKAGE_BRLTTY_TEXT_TABLE endif -comment "brltty needs a toolchain w/ threads, wchar" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR +comment "brltty needs a toolchain w/ dynamic lib, threads, wchar" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
Signature · 1 line
2.15.0
PATCH 3/3 package/brltty: depends on !BR2_STATIC_LIBS
Mario, All,
On 2017-12-30 11:48 +0100, Mario Lang spake thusly:
Quoted 4 lines
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 <[email protected]>
Regards,
Yann E. MORIN.
Quoted 31 lines
--- package/brltty/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)package/brltty/Config.in +3
-2@@ -2,6 +2,7 @@ config BR2_PACKAGE_BRLTTY bool "brltty" depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS help A daemon providing access to the Linux console for a blind person using a refreshable braille display.@@ -15,5 +16,5 @@ config BR2_PACKAGE_BRLTTY_TEXT_TABLE endif -comment "brltty needs a toolchain w/ threads, wchar" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR +comment "brltty needs a toolchain w/ dynamic lib, threads, wchar" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHARSignature · 6 lines
2.15.0 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
Thomas Petazzoni
AppliedPATCH 1/3 package/brltty: add missing dependency on host-pkgconf
In reply to Mario LangHello,
Quoted 7 lines · Mario Lang
This fixes the following error:
./configure: line 14978: .../host/bin/pkg-config: No such file or directorySigned-off-by Mario Lang <[email protected]>--- package/brltty/brltty.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com