Date: Tue, 3 Jan 2017 23:25:55 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r311201 - stable/11/share/mk Message-ID: <201701032325.v03NPtfs055884@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Tue Jan 3 23:25:55 2017 New Revision: 311201 URL: https://svnweb.freebsd.org/changeset/base/311201 Log: MFC r309478: DIRDEPS_BUILD: Fix '/' in group names creating a bad cookie. Modified: stable/11/share/mk/bsd.confs.mk stable/11/share/mk/bsd.files.mk stable/11/share/mk/bsd.incs.mk Directory Properties: stable/11/ (props changed) Modified: stable/11/share/mk/bsd.confs.mk ============================================================================== --- stable/11/share/mk/bsd.confs.mk Tue Jan 3 23:23:25 2017 (r311200) +++ stable/11/share/mk/bsd.confs.mk Tue Jan 3 23:25:55 2017 (r311201) @@ -24,8 +24,8 @@ ${group}OWN?= ${SHAREOWN} ${group}GRP?= ${SHAREGRP} ${group}MODE?= ${CONFMODE} ${group}DIR?= ${CONFDIR} -STAGE_SETS+= ${group} -STAGE_DIR.${group}= ${STAGE_OBJTOP}${${group}DIR} +STAGE_SETS+= ${group:C,[/*],_,g} +STAGE_DIR.${group:C,[/*],_,g}= ${STAGE_OBJTOP}${${group}DIR} _${group}CONFS= .for cnf in ${${group}} Modified: stable/11/share/mk/bsd.files.mk ============================================================================== --- stable/11/share/mk/bsd.files.mk Tue Jan 3 23:23:25 2017 (r311200) +++ stable/11/share/mk/bsd.files.mk Tue Jan 3 23:25:55 2017 (r311201) @@ -28,8 +28,8 @@ ${group}OWN?= ${SHAREOWN} ${group}GRP?= ${SHAREGRP} ${group}MODE?= ${SHAREMODE} ${group}DIR?= ${BINDIR} -STAGE_SETS+= ${group} -STAGE_DIR.${group}= ${STAGE_OBJTOP}${${group}DIR} +STAGE_SETS+= ${group:C,[/*],_,g} +STAGE_DIR.${group:C,[/*],_,g}= ${STAGE_OBJTOP}${${group}DIR} .if defined(NO_ROOT) .if !defined(${group}TAGS) || ! ${${group}TAGS:Mpackage=*} Modified: stable/11/share/mk/bsd.incs.mk ============================================================================== --- stable/11/share/mk/bsd.incs.mk Tue Jan 3 23:23:25 2017 (r311200) +++ stable/11/share/mk/bsd.incs.mk Tue Jan 3 23:25:55 2017 (r311201) @@ -33,9 +33,9 @@ ${group}OWN?= ${BINOWN} ${group}GRP?= ${BINGRP} ${group}MODE?= ${NOBINMODE} ${group}DIR?= ${INCLUDEDIR}${PRIVATELIB:D/private/${LIB}} -STAGE_SETS+= ${group} -STAGE_DIR.${group}= ${STAGE_OBJTOP}${${group}DIR} -STAGE_SYMLINKS_DIR.${group}= ${STAGE_OBJTOP} +STAGE_SETS+= ${group:C,[/*],_,g} +STAGE_DIR.${group:C,[/*],_,g}= ${STAGE_OBJTOP}${${group}DIR} +STAGE_SYMLINKS_DIR.${group:C,[/*],_,g}= ${STAGE_OBJTOP} _${group}INCS= .for header in ${${group}}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701032325.v03NPtfs055884>