[ptxdist] [PATCH 1/2] readline: fix pkg-config errors with NCURSES_WIDE_CHAR

[ptxdist] [PATCH 1/2] readline: fix pkg-config errors with NCURSES_WIDE_CHAR

[Michael Tretter]

readline.pc contains Requires.private=ncurses, even if readline is built
with ncursesw. When a user of readline uses pkg-config to ask for the
cflags, the lookup fails if ncursesw without compatibility with ncurses
is used.

Fix it by ensuring that ncurses compatibility is enabled if readline is
built with ncurses.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 rules/readline.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/readline.in b/rules/readline.in
index 036860409a56..7673ce7497eb 100644
--- a/rules/readline.in
+++ b/rules/readline.in
@@ -2,6 +2,7 @@
 menuconfig READLINE
 	tristate
 	select NCURSES if READLINE_NCURSES
+	select NCURSES_BACKWARD_COMPATIBLE_NON_WIDE_CHAR if READLINE_NCURSES && NCURSES_WIDE_CHAR
 	select TERMCAP if READLINE_TERMCAP
 	select GCCLIBS_GCC_S
 	prompt "readline                      "
-- 
2.39.2

[ptxdist] [PATCH 2/2] pipewire: fix readline support

[Michael Tretter]

Due to the missing PTXCONF_ prefix, pw-ctl was always built without
readline support even though the rule looked like readline support was
enabled. Furthermore, the readline dependency was pulled in.

Add the PTXCONF_ prefix to actually enable readline support.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 rules/pipewire.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/pipewire.make b/rules/pipewire.make
index 34081c5ceeb5..8747ebe6cecc 100644
--- a/rules/pipewire.make
+++ b/rules/pipewire.make
@@ -90,7 +90,7 @@ PIPEWIRE_CONF_OPT	:= \
 	-Dpw-cat=enabled \
 	-Dpw-cat-ffmpeg=disabled \
 	-Draop=$(call ptx/endis,PTXCONF_PIPEWIRE_RAOP)d \
-	-Dreadline=$(call ptx/endis,PIPEWIRE_PW_CTL)d \
+	-Dreadline=$(call ptx/endis,PTXCONF_PIPEWIRE_PW_CTL)d \
 	-Drlimits-install=false \
 	-Drlimits-match=@pipewire \
 	-Drlimits-memlock=4194304 \
-- 
2.39.2

Re: [ptxdist] [APPLIED] pipewire: fix readline support

[Michael Olbrich]

Thanks, applied as dd2d8a07716ca498ae9e0b69a0625c28d7be8655.

Michael

[sent from post-receive hook]

On Thu, 08 Feb 2024 17:03:21 +0100, Michael Tretter <m.tretter@pengutronix.de> wrote:
> Due to the missing PTXCONF_ prefix, pw-ctl was always built without
> readline support even though the rule looked like readline support was
> enabled. Furthermore, the readline dependency was pulled in.
> 
> Add the PTXCONF_ prefix to actually enable readline support.
> 
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> Message-Id: <20240130105815.3091486-2-m.tretter@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/pipewire.make b/rules/pipewire.make
> index 34081c5ceeb5..8747ebe6cecc 100644
> --- a/rules/pipewire.make
> +++ b/rules/pipewire.make
> @@ -90,7 +90,7 @@ PIPEWIRE_CONF_OPT	:= \
>  	-Dpw-cat=enabled \
>  	-Dpw-cat-ffmpeg=disabled \
>  	-Draop=$(call ptx/endis,PTXCONF_PIPEWIRE_RAOP)d \
> -	-Dreadline=$(call ptx/endis,PIPEWIRE_PW_CTL)d \
> +	-Dreadline=$(call ptx/endis,PTXCONF_PIPEWIRE_PW_CTL)d \
>  	-Drlimits-install=false \
>  	-Drlimits-match=@pipewire \
>  	-Drlimits-memlock=4194304 \

Re: [ptxdist] [APPLIED] readline: fix pkg-config errors with NCURSES_WIDE_CHAR

[Michael Olbrich]

Thanks, applied as 28a7d7667e32eb98ee2e7f25e88d48052a11d8f5.

Michael

[sent from post-receive hook]

On Thu, 08 Feb 2024 17:03:20 +0100, Michael Tretter <m.tretter@pengutronix.de> wrote:
> readline.pc contains Requires.private=ncurses, even if readline is built
> with ncursesw. When a user of readline uses pkg-config to ask for the
> cflags, the lookup fails if ncursesw without compatibility with ncurses
> is used.
> 
> Fix it by ensuring that ncurses compatibility is enabled if readline is
> built with ncurses.
> 
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> Message-Id: <20240130105815.3091486-1-m.tretter@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/readline.in b/rules/readline.in
> index 036860409a56..7673ce7497eb 100644
> --- a/rules/readline.in
> +++ b/rules/readline.in
> @@ -2,6 +2,7 @@
>  menuconfig READLINE
>  	tristate
>  	select NCURSES if READLINE_NCURSES
> +	select NCURSES_BACKWARD_COMPATIBLE_NON_WIDE_CHAR if READLINE_NCURSES && NCURSES_WIDE_CHAR
>  	select TERMCAP if READLINE_TERMCAP
>  	select GCCLIBS_GCC_S
>  	prompt "readline                      "