Date: Mon, 10 Sep 2018 13:41:22 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r479421 - head/Mk Message-ID: <201809101341.w8ADfMGJ085515@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon Sep 10 13:41:21 2018 New Revision: 479421 URL: https://svnweb.freebsd.org/changeset/ports/479421 Log: Move sanity checks later. Some USES set some variables that a porter may need to be aware and set some variables too late for sanity checks to do a good job. Modified: head/Mk/bsd.port.mk (contents, props changed) head/Mk/bsd.sanity.mk (contents, props changed) Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Mon Sep 10 13:41:19 2018 (r479420) +++ head/Mk/bsd.port.mk Mon Sep 10 13:41:21 2018 (r479421) @@ -1318,8 +1318,8 @@ WITH_DEBUG= yes # Start of pre-makefile section. .if !defined(AFTERPORTMK) && !defined(INOPTIONSMK) -.if defined(PORTNAME) -.include "${PORTSDIR}/Mk/bsd.sanity.mk" +.if defined(_PREMKINCLUDED) +DEV_ERROR+= "you cannot include bsd.port[.pre].mk twice" .endif _PREMKINCLUDED= yes @@ -2007,6 +2007,10 @@ ${_f}_ARGS:= ${f:C/^[^\:]*(\:|\$)//:S/,/ /g} .for f in ${_USES_POST} .include "${USESDIR}/${f:C/\:.*//}.mk" .endfor + +.if defined(PORTNAME) +.include "${PORTSDIR}/Mk/bsd.sanity.mk" +.endif .if defined(USE_LOCALE) CONFIGURE_ENV+= LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE} Modified: head/Mk/bsd.sanity.mk ============================================================================== --- head/Mk/bsd.sanity.mk Mon Sep 10 13:41:19 2018 (r479420) +++ head/Mk/bsd.sanity.mk Mon Sep 10 13:41:21 2018 (r479421) @@ -102,10 +102,6 @@ DEV_WARNING+= "USE_GNOME=desktopfileutils is deprecate DEV_ERROR+= "All LIB_DEPENDS should use the new format and start out with lib. \(libfoo.so vs foo.so\)" .endif -.if defined(_PREMKINCLUDED) -DEV_ERROR+= "you cannot include bsd.port[.pre].mk twice" -.endif - .if defined(LICENSE) .if ${LICENSE:MBSD} DEV_WARNING+= "LICENSE must not contain BSD, instead use BSD[234]CLAUSE"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809101341.w8ADfMGJ085515>