diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-11-25 19:13:45 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-11-25 19:13:45 +0000 |
| commit | 08b20c637cbc2dce75b1a64d7d3a87883bac24bc (patch) | |
| tree | 31dec31a2499c3eaf83f49ed6cb90811fe569e6f | |
| parent | 5e2f7161d7ef2f1e2ee5b8739fd026439a0f0cb6 (diff) | |
| download | src-08b20c637cbc2dce75b1a64d7d3a87883bac24bc.tar.gz src-08b20c637cbc2dce75b1a64d7d3a87883bac24bc.zip | |
META MODE: Don't add staged DPADDs to DIRDEPS when bootstrapping gendirdeps.
This was finding libraries that were installed into DESTDIR/usr/lib,
where DESTDIR is the stage directory, and then adding in usr/lib to
DIRDEPS. Just exclude the STAGE_ROOT if defined.
Discussed with: sjg
Sponsored by: EMC / Isilon Storage Division
Notes
Notes:
svn path=/head/; revision=291316
| -rw-r--r-- | share/mk/meta.autodep.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/mk/meta.autodep.mk b/share/mk/meta.autodep.mk index 85c3e61707c3..aa41c6e2041c 100644 --- a/share/mk/meta.autodep.mk +++ b/share/mk/meta.autodep.mk @@ -196,7 +196,7 @@ gendirdeps: ${_DEPENDFILE} # The pseudo machine "host" is used for HOST_TARGET DIRDEPS += \ ${DPADD:M${_OBJTOP}*:H:C,${_OBJTOP}[^/]*/,,:N.:O:u} \ - ${DPADD:M${_OBJROOT}*:N${_OBJTOP}*:H:S,${_OBJROOT},,:C,^([^/]+)/(.*),\2.\1,:S,${HOST_TARGET}$,host,:N.*:O:u} + ${DPADD:M${_OBJROOT}*:N${_OBJTOP}*:N${STAGE_ROOT:U${_OBJTOP}}/*:H:S,${_OBJROOT},,:C,^([^/]+)/(.*),\2.\1,:S,${HOST_TARGET}$,host,:N.*:O:u} .endif .endif |