d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

META_MODE: Fix staging not respecting _DIR overrides.

Browse Source 
This fixes atf-c.h not properly being installed to /usr/include/ (in
the stagedir) via its override of 'INCSDIR_atf-c.h= ${INCLUDEDIR}'.

This fixes building things that depend on atf.

Staging seems to ignore OWN/GRP/MODE settings and needs further exploration.

Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
bdrewery 2015-09-25 05:15:27 +00:00
parent 003e64c1ef
commit 99f1862333
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
share/mk/bsd.files.mk
View File

@ -47,10 +47,12 @@ ${group}NAME_${file:T}?= ${${group}NAME}
${group}NAME_${file:T}?= ${file:T}
.endif
.if !make(buildincludes)
STAGE_AS_SETS+= ${group}
STAGE_AS_SETS+= ${file:T}
.endif
STAGE_AS_${file:T}= ${${group}NAME_${file:T}}
stage_as.${group}: ${file}
# XXX {group}OWN,GRP,MODE
STAGE_DIR.${file:T}= ${STAGE_OBJTOP}${${group}DIR_${file:T}}
stage_as.${file:T}: ${file}
installfiles-${group}: _${group}INS_${file:T}
_${group}INS_${file:T}: ${file}

8
share/mk/bsd.incs.mk
View File

@ -42,10 +42,12 @@ ${group}NAME_${header:T}?= ${${group}NAME}
.else
${group}NAME_${header:T}?= ${header:T}
.endif
STAGE_AS_SETS+= ${group}
STAGE_AS_SETS+= ${header:T}
STAGE_AS_${header:T}= ${${group}NAME_${header:T}}
stage_as.${group}: ${header}
stage_includes: stage_as.${group}
# XXX {group}OWN,GRP,MODE
STAGE_DIR.${header:T}= ${STAGE_OBJTOP}${${group}DIR_${header:T}}
stage_as.${header:T}: ${header}
stage_includes: stage_as.${header:T}
installincludes: _${group}INS_${header:T}
_${group}INS_${header:T}: ${header}