Date: Wed, 25 Nov 2015 19:13:45 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r291316 - head/share/mk Message-ID: <201511251913.tAPJDjFm094889@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Wed Nov 25 19:13:45 2015 New Revision: 291316 URL: https://svnweb.freebsd.org/changeset/base/291316 Log: 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 Modified: head/share/mk/meta.autodep.mk Modified: head/share/mk/meta.autodep.mk ============================================================================== --- head/share/mk/meta.autodep.mk Wed Nov 25 19:13:42 2015 (r291315) +++ head/share/mk/meta.autodep.mk Wed Nov 25 19:13:45 2015 (r291316) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511251913.tAPJDjFm094889>