From: Peter Seiderer <ps.report@gmx.net>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/2] package/ytree: fix musl build
Date: Tue, 1 Oct 2019 23:41:57 +0200 [thread overview]
Message-ID: <20191001234157.62774cd0@gmx.net> (raw)
In-Reply-To: <20191001175911.16028-2-bernd.kuhls@t-online.de>
Hello Bernd,
thanks for investigation...
On Tue, 1 Oct 2019 19:59:11 +0200, Bernd Kuhls <bernd.kuhls@t-online.de> wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/ytree/0001-fix-musl.patch | 23 +++++++++++++++++++++++
> package/ytree/Config.in | 5 -----
> 2 files changed, 23 insertions(+), 5 deletions(-)
> create mode 100644 package/ytree/0001-fix-musl.patch
>
> diff --git a/package/ytree/0001-fix-musl.patch b/package/ytree/0001-fix-musl.patch
> new file mode 100644
> index 0000000000..72632122d6
> --- /dev/null
> +++ b/package/ytree/0001-fix-musl.patch
> @@ -0,0 +1,23 @@
> +Fix musl buildre_comp
> +
> +Fixes
> +
> + match.c.text+0x9c): undefined reference to `re_comp'
> + match.c.text+0xca): undefined reference to `re_exec'
> +
> +by using regcomp instead.
By adding a patch forcing to use the 'modern' regex methods
implementation instead of the obsolete re_comp/re_exec ([1])
one?
[1] http://man7.org/linux/man-pages/man3/re_comp.3.html
Regards,
Peter
> +
> +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> +
> +diff -uNr ytree-1.99pl2.orig/match.c ytree-1.99pl2/match.c
> +--- ytree-1.99pl2.orig/match.c 2019-09-29 12:37:57.000000000 +0200
> ++++ ytree-1.99pl2/match.c 2019-10-01 19:46:56.193815327 +0200
> +@@ -10,7 +10,7 @@
> + #include "ytree.h"
> +
> + #if defined( sun ) || defined( linux ) || defined( __NeXT__ ) || defined( OSF1 ) || defined( __OpenBSD__ ) || defined(__NetBSD__) || defined( __FreeBSD__ ) || defined( __GNU__ )
> +-#define HAS_REGEX
> ++#define HAS_REGCOMP
> + #endif
> +
> + #ifdef linux
> diff --git a/package/ytree/Config.in b/package/ytree/Config.in
> index c6f75b5590..3ac9283a56 100644
> --- a/package/ytree/Config.in
> +++ b/package/ytree/Config.in
> @@ -1,13 +1,8 @@
> config BR2_PACKAGE_YTREE
> bool "ytree"
> - depends on !BR2_TOOLCHAIN_USES_MUSL # re_comp/re_exec
> depends on BR2_USE_MMU # fork()
> select BR2_PACKAGE_NCURSES
> help
> Ytree - a (curses-based) file manager similar to DOS Xtree(tm)
>
> https://www.han.de/~werner/ytree.html
> -
> -comment "ytree needs a glibc or uClibc toolchain"
> - depends on BR2_USE_MMU
> - depends on BR2_TOOLCHAIN_USES_MUSL
next prev parent reply other threads:[~2019-10-01 21:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-01 17:59 [Buildroot] [PATCH 1/2] package/ytree: bump version to 1.99pl2 Bernd Kuhls
2019-10-01 17:59 ` [Buildroot] [PATCH 2/2] package/ytree: fix musl build Bernd Kuhls
2019-10-01 21:41 ` Peter Seiderer [this message]
2019-10-02 19:15 ` Thomas Petazzoni
2019-10-02 19:14 ` [Buildroot] [PATCH 1/2] package/ytree: bump version to 1.99pl2 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=20191001234157.62774cd0@gmx.net \
--to=ps.report@gmx.net \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.