ncurses: split libtinfo from libncurses
ClosedPublic
Actions

Authored by bapt on Sep 24 2021, 10:12 AM.

Details

Reviewers

swills
cy

Commits

rGcbc83e378a7e: ncurses: chase dependency changes in the source tree
rG396851c20aeb: ncurses: split libtinfo from libncurses

Summary

many external program expects libncurses to not be provided as a single
library. Instead of fixing all ports, distribute ncurses the way
upstream distributes it

Turn libncursesw.so into a ldscript which will link automatically as
needed to libtinfow so so this change is seamless at compile time.

ncurses: chase dependency changes in the source tree

bsdinstall: reduce overlinking

both distextract and distfetch does not directly use ncurses,
or figpart, drop their direct link to those libs

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

bapt created this revision.Sep 24 2021, 10:12 AM

Herald added a reviewer: cy. · View Herald TranscriptSep 24 2021, 10:12 AM

Herald added subscribers: emaste, imp, bdrewery. · View Herald Transcript

bapt requested review of this revision.Sep 24 2021, 10:12 AM

Harbormaster completed remote builds in B41695: Diff 95622.Sep 24 2021, 10:12 AM

add missing ldscript

Harbormaster completed remote builds in B41696: Diff 95623.Sep 24 2021, 10:15 AM

The message, if it is to become a commit message, could use some word-smithing. Here's my try at improving it:

Many external programs do not expect libncurses to be provided as a single
library. To improve the matters without changing all the relevant ports,
distribute ncurses the way upstream distributes it.

Turn libncursesw.so into an ldscript which will link automatically to
libtinfow as needed. This change is seamless at compile time.

Update the source tree to use the appropriate combination of tinfow and
ncursesw when linking.

Reduce overlinking in bsdinstall and pmc.

usr.bin/clang/lldb/Makefile
43 ↗	(On Diff #95623)	Probably showing my ignorance, but is this intentional?

bapt added inline comments.Sep 24 2021, 1:31 PM

usr.bin/clang/lldb/Makefile
43 ↗	(On Diff #95623)	yes, but should be in a separate commit

I don't know the base make stuff well enough to comment on it, but if devel/notcurses builds without ports ncurses with this change then it should be fine.

Looks good.

lib/ncurses/ncurses/Makefile
175	Where did all of the removed logic in this file go? Is it all unneeded?
usr.sbin/bsdinstall/distextract/Makefile
5 ↗	(On Diff #95623)	Lost `figpar` and `tinfow` I assume. Or is this the overlinking fix?
usr.sbin/bsdinstall/distfetch/Makefile
5 ↗	(On Diff #95623)	`tinfow`? Or is this also overlinking?
usr.sbin/pmc/Makefile
17 ↗	(On Diff #95623)	overlink fixes here? I'm starting to think these should be separate.

bapt marked 5 inline comments as done.Sep 28 2021, 11:52 AM

bapt added inline comments.

lib/ncurses/ncurses/Makefile
175	in the tinfo/makefile
usr.sbin/bsdinstall/distextract/Makefile
5 ↗	(On Diff #95623)	This the overlinking fix (in a separate commit)
usr.sbin/bsdinstall/distfetch/Makefile
5 ↗	(On Diff #95623)	Also overlinking
usr.sbin/pmc/Makefile
17 ↗	(On Diff #95623)	Overlinking fix, this is a separate commit, but phabricator does not help seeing it...

In D32098#724590, @swills wrote:

I don't know the base make stuff well enough to comment on it, but if devel/notcurses builds without ports ncurses with this change then it should be fine.

It does buidl fine the 2 ports (notcurses included) which are marked as USES=ncurses:port I checked