Sunday, September 28, 2025

Re: [PATCH] devel/readline-9.2.13p1 -> p2

oh I forgot about that - renaming the pkg-config file seems the most sensible way, but I agree now isn't a great time - let's pick this up again after unlock.

-- 
  Sent from a phone, apologies for poor formatting.


On 28 September 2025 16:10:30 Jeremie Courreges-Anglas <jca@wxcvbn.org> wrote:

On Sun, Sep 28, 2025 at 02:42:39PM +0100, Stuart Henderson wrote:
On 2025/09/28 22:26, SASANO Takayoshi wrote:
Hello,

Current devel/readline has following problem, this is catastrophic
with pkg_search_module() of CMake.

openbsd-current-vm# pkg-config --libs readline
Package termcap was not found in the pkg-config search path.
Perhaps you should add the directory containing `termcap.pc'
to the PKG_CONFIG_PATH environment variable
Package 'termcap', required by 'readline', not found
openbsd-current-vm#

this is caused by "Requires.private: termcap" in
/usr/local/lib/pkgconfig/readline.pc and the problem is not occur when
remove this line.

btw I am actually currently testing an update to readline 8.3 with the
dependent ports.

Here's the diff, ok?

not ok, see below

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/readline/Makefile,v
diff -u -p -r1.22 Makefile
--- Makefile 16 Aug 2025 14:26:42 -0000 1.22
+++ Makefile 28 Sep 2025 13:19:58 -0000
@@ -3,7 +3,7 @@ COMMENT = library to edit command lines
V = 8.2.13
DISTNAME = readline-${V}
PKGNAME = readline-${V}
-REVISION = 1
+REVISION = 2

LIBV = 3.0
SHARED_LIBS += ehistory ${LIBV}
Index: patches/patch-readline_pc_in
===================================================================
RCS file: patches/patch-readline_pc_in
diff -N patches/patch-readline_pc_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-readline_pc_in 28 Sep 2025 13:19:58 -0000
@@ -0,0 +1,9 @@
+--- readline.pc.in.orig Tue Apr  9 03:22:47 2019
++++ readline.pc.in Sun Sep 28 22:15:11 2025
+@@ -7,6 +7,5 @@ Name: Readline
+ Description: Gnu Readline library for command line editing
+ URL: http://tiswww.cwru.edu/php/chet/readline/rltop.html
+ Version: @LIBVERSION@
+-Requires.private: @TERMCAP_PKG_CONFIG_LIB@

That's the wrong fix, TERMCAP_PKG_CONFIG_LIB is set incorrectly and
should actually end up as "ncurses".

That can be done with

CONFIGURE_ENV = bash_cv_termcap_lib=ncurses

+ Libs: -L${libdir} -lreadline

that line is wrong for this port too, it needs -lereadline not -lreadline.

matthieu@ tried to address these two issues, see

  https://github.com/openbsd/ports/commits/master/devel/readline

Since it unbreaks detection of devel/readline it results in ports
picking it up, resulting in hidden deps or breakage during bulk
builds.  Neutering these hidden deps in existing ports or moving the
.pc to ereadline.pc could be a solution, as discussed by matthieu@ and
ajacoutot@.  No idea what's the best way forward, nor whether we
should actually do anything at this point in the release cycle.

-- 
jca

No comments:

Post a Comment