Page MenuHomeFreeBSD

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

Authored by arrowd on Wed, Feb 26, 3:42 PM.
Tags
None
Referenced Files
F111104574: D49136.id.diff
Thu, Feb 27, 11:43 AM
F111104218: D49136.id.diff
Thu, Feb 27, 11:35 AM
F111091191: D49136.diff
Thu, Feb 27, 7:28 AM
Unknown Object (File)
Wed, Feb 26, 7:28 PM
Unknown Object (File)
Wed, Feb 26, 7:22 PM
Unknown Object (File)
Wed, Feb 26, 7:21 PM
Unknown Object (File)
Wed, Feb 26, 7:21 PM
Unknown Object (File)
Wed, Feb 26, 7:20 PM
Subscribers

Details

Reviewers
bapt
Group Reviewers
portmgr
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
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 62634
Build 59518: arc lint + arc unit

Event Timeline

arrowd created this revision.
bapt added a subscriber: bapt.

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.Wed, Feb 26, 3:51 PM