Page MenuHomeFreeBSD
Differential D35494

framework: add new variable PKGCONFIG_BASE
ClosedPublic
Actions

Authored by tcberner on Jun 15 2022, 4:00 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Apr 18, 5:08 PM
Unknown Object (File)
Mon, Apr 14, 10:01 AM
Unknown Object (File)
Mon, Apr 14, 9:39 AM
Unknown Object (File)
Tue, Apr 8, 7:01 AM
Unknown Object (File)
Mar 19 2025, 8:39 AM
Unknown Object (File)
Mar 19 2025, 2:04 AM
Unknown Object (File)
Mar 15 2025, 2:20 PM
Unknown Object (File)
Mar 14 2025, 3:49 AM
View All Files
Subscribers
mat

Details

Reviewers
se
bapt
Group Reviewers
portmgr
Commits
R11:882f16714d90: framework: add new variable PKGCONFIG_BASE
Summary

The base system started to provide certain pkgconfig files for
components it provides. This new variable allows ports to prefer base
copmonents explicitely using for example

PKGCONFIG_BASE=foo

This will create a symlingk of /usr/libdata/pkgconfig/foo.pc to
${WKRDIR}/.pkgconfig and adding said path to pkgconfigs search path.

This allows us to switch easily between base and port implementation
of different components (say openssl) by simply defining the appropriate
variable in (say ssl.mk).

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 46002
Build 42890: arc lint + arc unit

Event Timeline

tcberner created this revision.Jun 15 2022, 4:00 PM
Herald added 1 blocking reviewer(s): portmgr. · View Herald TranscriptJun 15 2022, 4:00 PM
Herald added a subscriber: mat. · View Herald Transcript
tcberner requested review of this revision.Jun 15 2022, 4:00 PM
Harbormaster completed remote builds in B45990: Diff 106952.Jun 15 2022, 4:00 PM
bapt requested changes to this revision.Jun 15 2022, 4:03 PM
bapt added inline comments.
Mk/bsd.port.mk
1688

Here that should be PKG_CONFIGi_DIR=${PKG_CONFIG_LINKDIR}:${LOCALBASE}/libdata/pkgconfig

5162

I don't think the realpath call is necessary here.

This revision now requires changes to proceed.Jun 15 2022, 4:03 PM
tcberner added inline comments.Jun 15 2022, 4:06 PM
Mk/bsd.port.mk
5162

this was added, as some pc files are symlinks

tcberner updated this revision to Diff 106953.Jun 15 2022, 4:08 PM
  • document realpath usage
  • append default path to environment
Harbormaster completed remote builds in B45991: Diff 106953.Jun 15 2022, 4:08 PM
bapt added inline comments.Jun 15 2022, 6:19 PM
Mk/bsd.port.mk
1688

the real variable is PKG_CONFIG_LIBDIR

5162

RLN will expand to install -l rs, which in case of a symlink or symlink will to do the path expansion, so I stand by my the realpath call is not useful:

bapt@lappy:~ $ readlink /usr/libdata/pkgconfig/menu.pc
menuw.pc
bapt@lappy:~ $ install -l rs /usr/libdata/pkgconfig/menu.pc ./bla
bapt@lappy:~ $ readlink bla
../../libdata/pkgconfig/menuw.pc
tcberner updated this revision to Diff 106974.Jun 15 2022, 9:27 PM
  • Use proper pkg-config environment variable
  • Remove unnecessary realpath useage, which install (RLN) already handles
  • Also append /usr/libdata/pkgconfig to the environment
Harbormaster completed remote builds in B46001: Diff 106974.Jun 15 2022, 9:27 PM
tcberner marked 4 inline comments as done.Jun 15 2022, 9:29 PM
tcberner updated this revision to Diff 106975.Jun 15 2022, 9:34 PM
  • Use proper pkg-config environment variable
  • Remove unnecessary realpath useage, which install (RLN) already handles
  • Also append /usr/libdata/pkgconfig to the environment
Harbormaster completed remote builds in B46002: Diff 106975.Jun 15 2022, 9:34 PM
bapt accepted this revision.Jun 16 2022, 2:09 PM
This revision is now accepted and ready to land.Jun 16 2022, 2:09 PM
Closed by commit R11:882f16714d90: framework: add new variable PKGCONFIG_BASE (authored by tcberner). · Explain WhyJun 30 2022, 7:14 PM
This revision was automatically updated to reflect the committed changes.
tcberner added a commit: R11:882f16714d90: framework: add new variable PKGCONFIG_BASE.

Revision Contents
Changeset List

PathSize
Mk/
26 lines

Diff 106975

View Options

Mk/bsd.port.mk

Show First 20 Lines • Show All 81 Lines • ▼ Show 20 LinesFBSD_1.0 {
fchdir; fchdir;
fchflags; fchflags;
fchmod; fchmod;
fchown; fchown;
fcntl; fcntl;
fhopen; fhopen;
flock; flock;
fork; fork;
fpathconf; fpathconf;
kibUnsubmitted
Done
Inline Actions

Add context to the diff. Even without the context, I am sure that you put the symbols into the wrong namespace.

kib: Add context to the diff. Even without the context, I am sure that you put the symbols into the…
jack_gandi.netAuthorUnsubmitted
Done
Inline Actions

Should I add a FBSD_1.6 section then?

jack_gandi.net: Should I add a FBSD_1.6 section then?
jack_gandi.netAuthorUnsubmitted
Done
Inline Actions

nevermind, I just realized https://wiki.freebsd.org/AddingSyscalls says to put them in the most recent namespace (FBSD_1.5)

jack_gandi.net: nevermind, I just realized https://wiki.freebsd.org/AddingSyscalls says to put them in the most…
fsync; fsync;
futimes; futimes;
getaudit; getaudit;
getaudit_addr; getaudit_addr;
getauid; getauid;
getcontext; getcontext;
getdtablesize; getdtablesize;
getegid; getegid;
▲ Show 20 Lines • Show All 285 Lines • ▼ Show 20 LinesFBSD_1.5 {
fdatasync; fdatasync;
fhstat; fhstat;
fhstatfs; fhstatfs;
fstat; fstat;
fstatat; fstatat;
fstatfs; fstatfs;
getdents; getdents;
getdirentries; getdirentries;
getfsstat; getfsstat;
kibUnsubmitted
Not Done
Inline Actions

No, FBSD_1.5 is wrong again. New 13-CURRENT symbols must go into FBSD_1.6.

kib: No, FBSD_1.5 is wrong again. New 13-CURRENT symbols must go into FBSD_1.6.
getrandom; getrandom;
kevent; kevent;
lstat; lstat;
mknod; mknod;
mknodat; mknodat;
stat; stat;
statfs; statfs;
cpuset_getdomain; cpuset_getdomain;
cpuset_setdomain; cpuset_setdomain;
}; };
FBSD_1.6 {
fhlink;
fhlinkat;
fhreadlink;
getfhat;
};
FBSDprivate_1.0 { FBSDprivate_1.0 {
___acl_aclcheck_fd; ___acl_aclcheck_fd;
__sys___acl_aclcheck_fd; __sys___acl_aclcheck_fd;
___acl_aclcheck_file; ___acl_aclcheck_file;
__sys___acl_aclcheck_file; __sys___acl_aclcheck_file;
___acl_aclcheck_link; ___acl_aclcheck_link;
__sys___acl_aclcheck_link; __sys___acl_aclcheck_link;
___acl_delete_fd; ___acl_delete_fd;
▲ Show 20 Lines • Show All 153 Lines • ▼ Show 20 LinesFBSDprivate_1.0 {
__sys_fchown; __sys_fchown;
_fcntl; _fcntl;
__sys_fcntl; __sys_fcntl;
__fcntl_compat; __fcntl_compat;
_fhopen; _fhopen;
__sys_fhopen; __sys_fhopen;
_fhstat; _fhstat;
__sys_fhstat; __sys_fhstat;
_fhstatfs; _fhstatfs;
brooksUnsubmitted
Done
Inline Actions

I believe it's unnecessary to add these as there are no potential consumers of these symbols.

brooks: I believe it's unnecessary to add these as there are no potential consumers of these symbols.
__sys_fhstatfs; __sys_fhstatfs;
_flock; _flock;
__sys_flock; __sys_flock;
_fork; _fork;
__sys_fork; __sys_fork;
_fpathconf; _fpathconf;
__sys_fpathconf; __sys_fpathconf;
_fstat; _fstat;
▲ Show 20 Lines • Show All 443 Lines • Show Last 20 Lines