Page MenuHomeFreeBSD
Differential D22495

Update dirdeps.mk and gendirdeps.mk
ClosedPublic
Actions

Authored by sjg on Nov 22 2019, 12:29 AM.
Tags
None
Referenced Files
F114465229: D22495.id64708.diff
Sat, Apr 12, 8:18 PM
Unknown Object (File)
Thu, Apr 10, 10:57 PM
Unknown Object (File)
Mon, Apr 7, 5:42 PM
Unknown Object (File)
Mon, Mar 24, 8:25 AM
Unknown Object (File)
Sat, Mar 15, 6:37 PM
Unknown Object (File)
Feb 9 2025, 9:58 PM
Unknown Object (File)
Jan 13 2025, 3:58 PM
Unknown Object (File)
Dec 20 2024, 9:47 PM
View All 72 Files
Subscribers
bdrewery
emaste
imp

Details

Reviewers
bdrewery
Commits
rS355905: Update dirdeps.mk and gendirdeps.mk
rS355618: Update dirdeps.mk and gendirdeps.mk
Summary

The env space consumed by exporting all libc's .meta files
left little room for command line,
unexport when done.

Update dirdeps.mk to latest and add
dirdeps-targets.mk to simplify/update targets/Makefile

Makefile changes to go with Makefile.depend changes
in D22494

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

sjg created this revision.Nov 22 2019, 12:29 AM
Herald added subscribers: emaste, imp, bdrewery. · View Herald TranscriptNov 22 2019, 12:29 AM
Harbormaster completed remote builds in B27704: Diff 64708.Nov 22 2019, 12:29 AM
sjg added a reviewer: bdrewery.Nov 22 2019, 12:30 AM
sjg mentioned this in D22494: Update depends.
bdrewery added inline comments.Dec 10 2019, 10:27 PM
lib/libmagic/Makefile
43–54 ↗(On Diff #64708)

Strange this stuff wasn't needed before. I thought I had it working. Shrug this is fine.

share/mk/local.meta.sys.mk
99 ↗(On Diff #64708)

Does PYTHON not being set warrant all of this logic? Is there a risk it won't be set in MAKELEVEL > 0?

usr.sbin/rtsold/cap_llflags.c
47 ↗(On Diff #64708)

Unrelated change?

bdrewery accepted this revision.Dec 10 2019, 10:34 PM

I may disappear so I'll approve for now; my questions aren't blockers but I think there is an unrelated change that should be fixed first.

This revision is now accepted and ready to land.Dec 10 2019, 10:34 PM
Closed by commit rS355618: Update dirdeps.mk and gendirdeps.mk (authored by sjg). · Explain WhyDec 11 2019, 5:38 PM
This revision was automatically updated to reflect the committed changes.
sjg added a commit: rS355618: Update dirdeps.mk and gendirdeps.mk.
sjg added a commit: rS355905: Update dirdeps.mk and gendirdeps.mk.Dec 19 2019, 4:49 AM

Revision Contents
Changeset List

PathSize
head/
lib/
libbsnmp/
libbsnmp/
7 lines
libgcc_eh/
6 lines
libmagic/
6 lines
libpmc/
8 lines
share/
mk/
134 lines
32 lines
11 lines
29 lines
6 lines
1 line
4 lines
6 lines
targets/
71 lines
5 lines

Diff 65501

View Options

head/lib/libbsnmp/libbsnmp/Makefile

Show First 20 Lines • Show All 49 Lines • ▼ Show 20 Linesstruct componentname {
/* /*
* Shared between lookup and commit routines. * Shared between lookup and commit routines.
*/ */
char *cn_pnbuf; /* pathname buffer */ char *cn_pnbuf; /* pathname buffer */
char *cn_nameptr; /* pointer to looked up name */ char *cn_nameptr; /* pointer to looked up name */
long cn_namelen; /* length of looked up component */ long cn_namelen; /* length of looked up component */
}; };
struct nameicap_tracker;
TAILQ_HEAD(nameicap_tracker_head, nameicap_tracker);
/* /*
* Encapsulation of namei parameters. * Encapsulation of namei parameters.
*/ */
struct nameidata { struct nameidata {
/* /*
* Arguments to namei/lookup. * Arguments to namei/lookup.
*/ */
const char *ni_dirp; /* pathname pointer */ const char *ni_dirp; /* pathname pointer */
enum uio_seg ni_segflg; /* location of pathname */ enum uio_seg ni_segflg; /* location of pathname */
cap_rights_t ni_rightsneeded; /* rights required to look up vnode */ cap_rights_t ni_rightsneeded; /* rights required to look up vnode */
/* /*
* Arguments to lookup. * Arguments to lookup.
*/ */
struct vnode *ni_startdir; /* starting directory */ struct vnode *ni_startdir; /* starting directory */
struct vnode *ni_rootdir; /* logical root directory */ struct vnode *ni_rootdir; /* logical root directory */
struct vnode *ni_topdir; /* logical top directory */ struct vnode *ni_topdir; /* logical top directory */
int ni_dirfd; /* starting directory for *at functions */ int ni_dirfd; /* starting directory for *at functions */
int ni_strictrelative; /* relative lookup only; no '..' */ int ni_strictrelative; /* relative lookup only */
/* /*
* Results: returned from namei * Results: returned from namei
*/ */
struct filecaps ni_filecaps; /* rights the *at base has */ struct filecaps ni_filecaps; /* rights the *at base has */
/* /*
* Results: returned from/manipulated by lookup * Results: returned from/manipulated by lookup
*/ */
struct vnode *ni_vp; /* vnode of result */ struct vnode *ni_vp; /* vnode of result */
struct vnode *ni_dvp; /* vnode of intermediate directory */ struct vnode *ni_dvp; /* vnode of intermediate directory */
/* /*
* Shared between namei and lookup/commit routines. * Shared between namei and lookup/commit routines.
*/ */
size_t ni_pathlen; /* remaining chars in path */ size_t ni_pathlen; /* remaining chars in path */
char *ni_next; /* next location in pathname */ char *ni_next; /* next location in pathname */
u_int ni_loopcnt; /* count of symlinks encountered */ u_int ni_loopcnt; /* count of symlinks encountered */
/* /*
* Lookup parameters: this structure describes the subset of * Lookup parameters: this structure describes the subset of
* information from the nameidata structure that is passed * information from the nameidata structure that is passed
* through the VOP interface. * through the VOP interface.
*/ */
struct componentname ni_cnd; struct componentname ni_cnd;
struct nameicap_tracker_head ni_cap_tracker;
int ni_cap_dotdot; /* ".." in strictrelative case */
}; };
#ifdef _KERNEL #ifdef _KERNEL
/* /*
* namei operations * namei operations
*/ */
#define LOOKUP 0 /* perform name lookup only */ #define LOOKUP 0 /* perform name lookup only */
#define CREATE 1 /* setup for file creation */ #define CREATE 1 /* setup for file creation */
▲ Show 20 Lines • Show All 100 Lines • Show Last 20 Lines
View Options

head/lib/libgcc_eh/Makefile

Show First 20 Lines • Show All 49 Lines • ▼ Show 20 Linesstruct componentname {
/* /*
* Shared between lookup and commit routines. * Shared between lookup and commit routines.
*/ */
char *cn_pnbuf; /* pathname buffer */ char *cn_pnbuf; /* pathname buffer */
char *cn_nameptr; /* pointer to looked up name */ char *cn_nameptr; /* pointer to looked up name */
long cn_namelen; /* length of looked up component */ long cn_namelen; /* length of looked up component */
}; };
struct nameicap_tracker;
TAILQ_HEAD(nameicap_tracker_head, nameicap_tracker);
/* /*
* Encapsulation of namei parameters. * Encapsulation of namei parameters.
*/ */
struct nameidata { struct nameidata {
/* /*
* Arguments to namei/lookup. * Arguments to namei/lookup.
*/ */
const char *ni_dirp; /* pathname pointer */ const char *ni_dirp; /* pathname pointer */
enum uio_seg ni_segflg; /* location of pathname */ enum uio_seg ni_segflg; /* location of pathname */
cap_rights_t ni_rightsneeded; /* rights required to look up vnode */ cap_rights_t ni_rightsneeded; /* rights required to look up vnode */
/* /*
* Arguments to lookup. * Arguments to lookup.
*/ */
struct vnode *ni_startdir; /* starting directory */ struct vnode *ni_startdir; /* starting directory */
struct vnode *ni_rootdir; /* logical root directory */ struct vnode *ni_rootdir; /* logical root directory */
struct vnode *ni_topdir; /* logical top directory */ struct vnode *ni_topdir; /* logical top directory */
int ni_dirfd; /* starting directory for *at functions */ int ni_dirfd; /* starting directory for *at functions */
int ni_strictrelative; /* relative lookup only; no '..' */ int ni_strictrelative; /* relative lookup only */
/* /*
* Results: returned from namei * Results: returned from namei
*/ */
struct filecaps ni_filecaps; /* rights the *at base has */ struct filecaps ni_filecaps; /* rights the *at base has */
/* /*
* Results: returned from/manipulated by lookup * Results: returned from/manipulated by lookup
*/ */
struct vnode *ni_vp; /* vnode of result */ struct vnode *ni_vp; /* vnode of result */
struct vnode *ni_dvp; /* vnode of intermediate directory */ struct vnode *ni_dvp; /* vnode of intermediate directory */
/* /*
* Shared between namei and lookup/commit routines. * Shared between namei and lookup/commit routines.
*/ */
size_t ni_pathlen; /* remaining chars in path */ size_t ni_pathlen; /* remaining chars in path */
char *ni_next; /* next location in pathname */ char *ni_next; /* next location in pathname */
u_int ni_loopcnt; /* count of symlinks encountered */ u_int ni_loopcnt; /* count of symlinks encountered */
/* /*
* Lookup parameters: this structure describes the subset of * Lookup parameters: this structure describes the subset of
* information from the nameidata structure that is passed * information from the nameidata structure that is passed
* through the VOP interface. * through the VOP interface.
*/ */
struct componentname ni_cnd; struct componentname ni_cnd;
struct nameicap_tracker_head ni_cap_tracker;
int ni_cap_dotdot; /* ".." in strictrelative case */
}; };
#ifdef _KERNEL #ifdef _KERNEL
/* /*
* namei operations * namei operations
*/ */
#define LOOKUP 0 /* perform name lookup only */ #define LOOKUP 0 /* perform name lookup only */
#define CREATE 1 /* setup for file creation */ #define CREATE 1 /* setup for file creation */
▲ Show 20 Lines • Show All 100 Lines • Show Last 20 Lines
View Options

head/lib/libmagic/Makefile

Show First 20 Lines • Show All 49 Lines • ▼ Show 20 Linesstruct componentname {
/* /*
* Shared between lookup and commit routines. * Shared between lookup and commit routines.
*/ */
char *cn_pnbuf; /* pathname buffer */ char *cn_pnbuf; /* pathname buffer */
char *cn_nameptr; /* pointer to looked up name */ char *cn_nameptr; /* pointer to looked up name */
long cn_namelen; /* length of looked up component */ long cn_namelen; /* length of looked up component */
}; };
struct nameicap_tracker;
TAILQ_HEAD(nameicap_tracker_head, nameicap_tracker);
/* /*
* Encapsulation of namei parameters. * Encapsulation of namei parameters.
*/ */
struct nameidata { struct nameidata {
/* /*
* Arguments to namei/lookup. * Arguments to namei/lookup.
*/ */
const char *ni_dirp; /* pathname pointer */ const char *ni_dirp; /* pathname pointer */
enum uio_seg ni_segflg; /* location of pathname */ enum uio_seg ni_segflg; /* location of pathname */
cap_rights_t ni_rightsneeded; /* rights required to look up vnode */ cap_rights_t ni_rightsneeded; /* rights required to look up vnode */
/* /*
* Arguments to lookup. * Arguments to lookup.
*/ */
struct vnode *ni_startdir; /* starting directory */ struct vnode *ni_startdir; /* starting directory */
struct vnode *ni_rootdir; /* logical root directory */ struct vnode *ni_rootdir; /* logical root directory */
struct vnode *ni_topdir; /* logical top directory */ struct vnode *ni_topdir; /* logical top directory */
int ni_dirfd; /* starting directory for *at functions */ int ni_dirfd; /* starting directory for *at functions */
int ni_strictrelative; /* relative lookup only; no '..' */ int ni_strictrelative; /* relative lookup only */
/* /*
* Results: returned from namei * Results: returned from namei
*/ */
struct filecaps ni_filecaps; /* rights the *at base has */ struct filecaps ni_filecaps; /* rights the *at base has */
/* /*
* Results: returned from/manipulated by lookup * Results: returned from/manipulated by lookup
*/ */
struct vnode *ni_vp; /* vnode of result */ struct vnode *ni_vp; /* vnode of result */
struct vnode *ni_dvp; /* vnode of intermediate directory */ struct vnode *ni_dvp; /* vnode of intermediate directory */
/* /*
* Shared between namei and lookup/commit routines. * Shared between namei and lookup/commit routines.
*/ */
size_t ni_pathlen; /* remaining chars in path */ size_t ni_pathlen; /* remaining chars in path */
char *ni_next; /* next location in pathname */ char *ni_next; /* next location in pathname */
u_int ni_loopcnt; /* count of symlinks encountered */ u_int ni_loopcnt; /* count of symlinks encountered */
/* /*
* Lookup parameters: this structure describes the subset of * Lookup parameters: this structure describes the subset of
* information from the nameidata structure that is passed * information from the nameidata structure that is passed
* through the VOP interface. * through the VOP interface.
*/ */
struct componentname ni_cnd; struct componentname ni_cnd;
struct nameicap_tracker_head ni_cap_tracker;
int ni_cap_dotdot; /* ".." in strictrelative case */
}; };
#ifdef _KERNEL #ifdef _KERNEL
/* /*
* namei operations * namei operations
*/ */
#define LOOKUP 0 /* perform name lookup only */ #define LOOKUP 0 /* perform name lookup only */
#define CREATE 1 /* setup for file creation */ #define CREATE 1 /* setup for file creation */
▲ Show 20 Lines • Show All 100 Lines • Show Last 20 Lines
View Options

head/lib/libpmc/Makefile

Show First 20 Lines • Show All 49 Lines • ▼ Show 20 Linesstruct componentname {
/* /*
* Shared between lookup and commit routines. * Shared between lookup and commit routines.
*/ */
char *cn_pnbuf; /* pathname buffer */ char *cn_pnbuf; /* pathname buffer */
char *cn_nameptr; /* pointer to looked up name */ char *cn_nameptr; /* pointer to looked up name */
long cn_namelen; /* length of looked up component */ long cn_namelen; /* length of looked up component */
}; };
struct nameicap_tracker;
TAILQ_HEAD(nameicap_tracker_head, nameicap_tracker);
/* /*
* Encapsulation of namei parameters. * Encapsulation of namei parameters.
*/ */
struct nameidata { struct nameidata {
/* /*
* Arguments to namei/lookup. * Arguments to namei/lookup.
*/ */
const char *ni_dirp; /* pathname pointer */ const char *ni_dirp; /* pathname pointer */
enum uio_seg ni_segflg; /* location of pathname */ enum uio_seg ni_segflg; /* location of pathname */
cap_rights_t ni_rightsneeded; /* rights required to look up vnode */ cap_rights_t ni_rightsneeded; /* rights required to look up vnode */
/* /*
* Arguments to lookup. * Arguments to lookup.
*/ */
struct vnode *ni_startdir; /* starting directory */ struct vnode *ni_startdir; /* starting directory */
struct vnode *ni_rootdir; /* logical root directory */ struct vnode *ni_rootdir; /* logical root directory */
struct vnode *ni_topdir; /* logical top directory */ struct vnode *ni_topdir; /* logical top directory */
int ni_dirfd; /* starting directory for *at functions */ int ni_dirfd; /* starting directory for *at functions */
int ni_strictrelative; /* relative lookup only; no '..' */ int ni_strictrelative; /* relative lookup only */
/* /*
* Results: returned from namei * Results: returned from namei
*/ */
struct filecaps ni_filecaps; /* rights the *at base has */ struct filecaps ni_filecaps; /* rights the *at base has */
/* /*
* Results: returned from/manipulated by lookup * Results: returned from/manipulated by lookup
*/ */
struct vnode *ni_vp; /* vnode of result */ struct vnode *ni_vp; /* vnode of result */
struct vnode *ni_dvp; /* vnode of intermediate directory */ struct vnode *ni_dvp; /* vnode of intermediate directory */
/* /*
* Shared between namei and lookup/commit routines. * Shared between namei and lookup/commit routines.
*/ */
size_t ni_pathlen; /* remaining chars in path */ size_t ni_pathlen; /* remaining chars in path */
char *ni_next; /* next location in pathname */ char *ni_next; /* next location in pathname */
u_int ni_loopcnt; /* count of symlinks encountered */ u_int ni_loopcnt; /* count of symlinks encountered */
/* /*
* Lookup parameters: this structure describes the subset of * Lookup parameters: this structure describes the subset of
* information from the nameidata structure that is passed * information from the nameidata structure that is passed
* through the VOP interface. * through the VOP interface.
*/ */
struct componentname ni_cnd; struct componentname ni_cnd;
struct nameicap_tracker_head ni_cap_tracker;
int ni_cap_dotdot; /* ".." in strictrelative case */
}; };
#ifdef _KERNEL #ifdef _KERNEL
/* /*
* namei operations * namei operations
*/ */
#define LOOKUP 0 /* perform name lookup only */ #define LOOKUP 0 /* perform name lookup only */
#define CREATE 1 /* setup for file creation */ #define CREATE 1 /* setup for file creation */
▲ Show 20 Lines • Show All 100 Lines • Show Last 20 Lines
View Options

head/share/mk/dirdeps-targets.mk

Show First 20 Lines • Show All 49 Lines • ▼ Show 20 Linesstruct componentname {
/* /*
* Shared between lookup and commit routines. * Shared between lookup and commit routines.
*/ */
char *cn_pnbuf; /* pathname buffer */ char *cn_pnbuf; /* pathname buffer */
char *cn_nameptr; /* pointer to looked up name */ char *cn_nameptr; /* pointer to looked up name */
long cn_namelen; /* length of looked up component */ long cn_namelen; /* length of looked up component */
}; };
struct nameicap_tracker;
TAILQ_HEAD(nameicap_tracker_head, nameicap_tracker);
/* /*
* Encapsulation of namei parameters. * Encapsulation of namei parameters.
*/ */
struct nameidata { struct nameidata {
/* /*
* Arguments to namei/lookup. * Arguments to namei/lookup.
*/ */
const char *ni_dirp; /* pathname pointer */ const char *ni_dirp; /* pathname pointer */
enum uio_seg ni_segflg; /* location of pathname */ enum uio_seg ni_segflg; /* location of pathname */
cap_rights_t ni_rightsneeded; /* rights required to look up vnode */ cap_rights_t ni_rightsneeded; /* rights required to look up vnode */
/* /*
* Arguments to lookup. * Arguments to lookup.
*/ */
struct vnode *ni_startdir; /* starting directory */ struct vnode *ni_startdir; /* starting directory */
struct vnode *ni_rootdir; /* logical root directory */ struct vnode *ni_rootdir; /* logical root directory */
struct vnode *ni_topdir; /* logical top directory */ struct vnode *ni_topdir; /* logical top directory */
int ni_dirfd; /* starting directory for *at functions */ int ni_dirfd; /* starting directory for *at functions */
int ni_strictrelative; /* relative lookup only; no '..' */ int ni_strictrelative; /* relative lookup only */
/* /*
* Results: returned from namei * Results: returned from namei
*/ */
struct filecaps ni_filecaps; /* rights the *at base has */ struct filecaps ni_filecaps; /* rights the *at base has */
/* /*
* Results: returned from/manipulated by lookup * Results: returned from/manipulated by lookup
*/ */
struct vnode *ni_vp; /* vnode of result */ struct vnode *ni_vp; /* vnode of result */
struct vnode *ni_dvp; /* vnode of intermediate directory */ struct vnode *ni_dvp; /* vnode of intermediate directory */
/* /*
* Shared between namei and lookup/commit routines. * Shared between namei and lookup/commit routines.
*/ */
size_t ni_pathlen; /* remaining chars in path */ size_t ni_pathlen; /* remaining chars in path */
char *ni_next; /* next location in pathname */ char *ni_next; /* next location in pathname */
u_int ni_loopcnt; /* count of symlinks encountered */ u_int ni_loopcnt; /* count of symlinks encountered */
/* /*
* Lookup parameters: this structure describes the subset of * Lookup parameters: this structure describes the subset of
* information from the nameidata structure that is passed * information from the nameidata structure that is passed
* through the VOP interface. * through the VOP interface.
*/ */
struct componentname ni_cnd; struct componentname ni_cnd;
struct nameicap_tracker_head ni_cap_tracker;
int ni_cap_dotdot; /* ".." in strictrelative case */
}; };
#ifdef _KERNEL #ifdef _KERNEL
/* /*
* namei operations * namei operations
*/ */
#define LOOKUP 0 /* perform name lookup only */ #define LOOKUP 0 /* perform name lookup only */
#define CREATE 1 /* setup for file creation */ #define CREATE 1 /* setup for file creation */
▲ Show 20 Lines • Show All 100 Lines • Show Last 20 Lines
View Options

head/share/mk/dirdeps.mk

Loading...
View Options

head/share/mk/gendirdeps.mk

Loading...
View Options

head/share/mk/local.dirdeps-options.mk

Loading...
View Options

head/share/mk/local.dirdeps.mk

Loading...
View Options

head/share/mk/local.gendirdeps.mk

Loading...
View Options

head/share/mk/local.meta.sys.mk

Loading...
View Options

head/share/mk/meta.sys.mk

Loading...
View Options

head/targets/Makefile

Loading...
View Options

head/targets/Makefile.inc

Loading...