* [Buildroot] [PATCH 1/2] package/ytree: bump version to 1.99pl2
@ 2019-10-01 17:59 Bernd Kuhls
2019-10-01 17:59 ` [Buildroot] [PATCH 2/2] package/ytree: fix musl build Bernd Kuhls
2019-10-02 19:14 ` [Buildroot] [PATCH 1/2] package/ytree: bump version to 1.99pl2 Thomas Petazzoni
0 siblings, 2 replies; 5+ messages in thread
From: Bernd Kuhls @ 2019-10-01 17:59 UTC (permalink / raw)
To: buildroot
Changelog: https://www.han.de/~werner/ytree.html
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/ytree/ytree.hash | 2 +-
package/ytree/ytree.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/ytree/ytree.hash b/package/ytree/ytree.hash
index a671279558..3405c22d37 100644
--- a/package/ytree/ytree.hash
+++ b/package/ytree/ytree.hash
@@ -1,3 +1,3 @@
# Locally computed
-sha256 763e8c2af528174cd738ed8f2eca62579e3edef57ccbd242be7cf181ae15d251 ytree-1.99pl1.tar.gz
+sha256 9d14e173183676bfb5da93ff90909547aa19f888504e45058a91f3bbd9d9112d ytree-1.99pl2.tar.gz
sha256 eb6bf7204569b4fe8eaf9d4dffc57e44047c5efb5deba1b2d99069ddbc99d031 COPYING
diff --git a/package/ytree/ytree.mk b/package/ytree/ytree.mk
index 2d2a6946f7..863eba741c 100644
--- a/package/ytree/ytree.mk
+++ b/package/ytree/ytree.mk
@@ -4,7 +4,7 @@
#
################################################################################
-YTREE_VERSION = 1.99pl1
+YTREE_VERSION = 1.99pl2
YTREE_SITE = https://www.han.de/~werner
YTREE_LICENSE = GPL-2.0
YTREE_LICENSE_FILES = COPYING
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 2/2] package/ytree: fix musl build
2019-10-01 17:59 [Buildroot] [PATCH 1/2] package/ytree: bump version to 1.99pl2 Bernd Kuhls
@ 2019-10-01 17:59 ` Bernd Kuhls
2019-10-01 21:41 ` Peter Seiderer
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
1 sibling, 2 replies; 5+ messages in thread
From: Bernd Kuhls @ 2019-10-01 17:59 UTC (permalink / raw)
To: buildroot
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 build
+
+Fixes
+
+ match.c.text+0x9c): undefined reference to `re_comp'
+ match.c.text+0xca): undefined reference to `re_exec'
+
+by using regcomp instead.
+
+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
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 2/2] package/ytree: fix musl build
2019-10-01 17:59 ` [Buildroot] [PATCH 2/2] package/ytree: fix musl build Bernd Kuhls
@ 2019-10-01 21:41 ` Peter Seiderer
2019-10-02 19:15 ` Thomas Petazzoni
1 sibling, 0 replies; 5+ messages in thread
From: Peter Seiderer @ 2019-10-01 21:41 UTC (permalink / raw)
To: buildroot
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/2] package/ytree: bump version to 1.99pl2
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-02 19:14 ` Thomas Petazzoni
1 sibling, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2019-10-02 19:14 UTC (permalink / raw)
To: buildroot
On Tue, 1 Oct 2019 19:59:10 +0200
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:
> Changelog: https://www.han.de/~werner/ytree.html
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/ytree/ytree.hash | 2 +-
> package/ytree/ytree.mk | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 2/2] package/ytree: fix musl build
2019-10-01 17:59 ` [Buildroot] [PATCH 2/2] package/ytree: fix musl build Bernd Kuhls
2019-10-01 21:41 ` Peter Seiderer
@ 2019-10-02 19:15 ` Thomas Petazzoni
1 sibling, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2019-10-02 19:15 UTC (permalink / raw)
To: buildroot
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
Applied to master after improving the commit log of the patch, as
suggested by Peter Seiderer.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-10-02 19:15 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox