package/ytree: bump version to 1.99pl2
PATCH 1/2 package/ytree: bump version to 1.99pl2
Changelog: https://www.han.de/~werner/ytree.html
Signed-off-by Bernd Kuhls <[email protected]>
--- package/ytree/ytree.hash | 2 +- package/ytree/ytree.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/ytree/ytree.hash +1 -1
@@ -1,3 +1,3 @@ # Locally computed -sha256 763e8c2af528174cd738ed8f2eca62579e3edef57ccbd242be7cf181ae15d251 ytree-1.99pl1.tar.gz +sha256 9d14e173183676bfb5da93ff90909547aa19f888504e45058a91f3bbd9d9112d ytree-1.99pl2.tar.gz sha256 eb6bf7204569b4fe8eaf9d4dffc57e44047c5efb5deba1b2d99069ddbc99d031 COPYING
package/ytree/ytree.mk +1 -1
@@ -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
Signature · 1 line
2.20.1
PATCH 2/2 package/ytree: fix musl build
Signed-off-by Bernd Kuhls <[email protected]>
--- 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
package/ytree/0001-fix-musl.patch new file +23 -0
@@ -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 <[email protected]> + +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
package/ytree/Config.in +0 -5
@@ -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
Signature · 1 line
2.20.1
PATCH 2/2 package/ytree: fix musl build
Hello Bernd,
thanks for investigation...
Quoted 13 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>--- 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.patchpackage/ytree/0001-fix-musl.patch new file +0
-0
package/ytree/0001-fix-musl.patch line 8
Quoted 8 lines
package/ytree/0001-fix-musl.patch new file +8
-0@@ -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
Quoted 33 lines
package/ytree/0001-fix-musl.patch new file +15
-0+ +Signed-off-by: Bernd Kuhls <[email protected]> + +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 linuxpackage/ytree/Config.in +0
-5@@ -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
Thomas Petazzoni
AppliedPATCH 2/2 package/ytree: fix musl build
In reply to Bernd KuhlsQuoted 6 lines · On Tue, 1 Oct 2019 19:59:11 +0200 Bernd Kuhls <[email protected]> wrote:
Signed-off-by Bernd Kuhls <[email protected]>--- 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
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Thomas Petazzoni
AppliedPATCH 1/2 package/ytree: bump version to 1.99pl2
In reply to Bernd KuhlsQuoted 7 lines · On Tue, 1 Oct 2019 19:59:10 +0200 Bernd Kuhls <[email protected]> wrote:
Changelog: https://www.han.de/~werner/ytree.html
Signed-off-by Bernd Kuhls <[email protected]>--- package/ytree/ytree.hash | 2 +- package/ytree/ytree.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com