Mk/bsd.port.mk: Setup SHLIB_PROVIDE_PATHS* vars for pkg
ClosedPublic
Actions

Authored by arrowd on Feb 26 2025, 3:42 PM.

Details

Reviewers

bapt

Group Reviewers

portmgr

Commits

R11:682808b321a3: Mk/bsd.port.mk: Setup SHLIB_PROVIDE_PATHS* vars for pkg

Summary

This changes picks a new pkg feature: https://github.com/freebsd/pkg/pull/2422

The idea behind the .if ${LINUX_DEFAULT} ... check comes from the Linux ld.so(8) man page that says

(5) In the default path /lib, and then /usr/lib. (On some 64-bit
architectures, the default paths for 64-bit shared objects
are /lib64, and then /usr/lib64.)

CentOS 7 and Rocky Linux 9 that we have in Ports install 32 bit libraries into /usr/lib and
64 bit libraries into /usr/lib64. /lib and /lib64 are symlink, so I omitted them.

Test Plan

With pkg-devel-2.0.99.5:

emulators/libc6-shim does not provide anymore, as it's expected
benchmarks/filebench a small port with USE_LDCONFIG=somedir provides correctly

Diff Detail

Repository

R11 FreeBSD ports repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

arrowd requested review of this revision.Feb 26 2025, 3:42 PM

arrowd created this revision.

Harbormaster completed remote builds in B62634: Diff 151504.Feb 26 2025, 3:42 PM

I think this is exactly what we need, we would require 2 exp-run:
1 with regular pkg to ensure we are not breaking anything
1 with WITH_PKG=devel to ensure it works as expected

This revision is now accepted and ready to land.Feb 26 2025, 3:51 PM

Closed by commit R11:682808b321a3: Mk/bsd.port.mk: Setup SHLIB_PROVIDE_PATHS* vars for pkg (authored by arrowd). · Explain WhyMar 6 2025, 11:08 AM

This revision was automatically updated to reflect the committed changes.

arrowd added a commit: R11:682808b321a3: Mk/bsd.port.mk: Setup SHLIB_PROVIDE_PATHS* vars for pkg.