From nobody Wed Jan 11 22:42:19 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NsjNq5Lh0z2sNjM; Wed, 11 Jan 2023 22:42:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NsjNq4xmWz3xfk; Wed, 11 Jan 2023 22:42:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673476939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZEuHCClF6AVjkpIZbPaoL4dVGhtiwUCLhWzMN5wLJic=; b=e7MoAPyk4DOEU2XcyVo/XQa+s4UGyReENdgrj8Hy8pgqJducMaU+HDGwNUPEMQfDHofpGJ nsvulfZhoctpjUF+EMX9kVmjWyXohrlpLldKzd/7yvyQh0HdrPOa1R5IfaNVTQib16tFFe YNcexDL9dsHT8B5qI9eYqJxakZKXJ9tqLPsubzt0nZYBaHEc1SemCgfUlBCPFlkdXSFVuA MvU6XPx4DaY9FnBeH7cN7BzKuituRQh8am92vHAol9y/bUjOdYBkdP17DPG1I++Mu3bjM/ 0OqyKwlksVb09wQtVW94wLMXx/+LI32WRCFweUykUtL7EkuwXUaxXLJnf2ZKGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673476939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZEuHCClF6AVjkpIZbPaoL4dVGhtiwUCLhWzMN5wLJic=; b=XPPwubwSErDXGHJErx9/RmgEAuyRcF38ePYIzU1ja6b+JoRv7ox3rC6GVlO/nFDBDbWtab RC9wtyXRN8NzAYgfR/I7ZlVXrvWbLnpTsqr/xdCagfl4dKx6UFjzgvXIC84LY6ZcwVykJI MdXKV433rKuDu9i14nNT2JN7IEfzgJvLdI5JOXdq7BkjSrmDj79iZfimiMMtuzN6LV/0Rt rFr3+YdOuVIk2hIEEFmYrJ6uPQaZNbZNXkPe1gKJYFRUiNRgBbud8B8LA6/wVsfL9Y8V1f o1Fh8wSbKW4fefOmGdpcsn8nY8d3MmzxnDeHMePGj5+DUH7gtKu0O5LjaPtjow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673476939; a=rsa-sha256; cv=none; b=CkEszYwvKAWwfckxCPMaLIcaWvH5dA0YguGId/Lj1HFHp5XZ5RGFwtrD9tTIRhsCZeO4QY KBLQOLvV3GgeCSjqoHg0mluVf4SekrBOZJkI6sbnWDb+UnKiOEvTOtRlLIqiXE3Jg7ld8g oJIvmY/621uo61Z2QFg67QIkZ72Kua4ZuNUiJV8CktGddmAE3PJsqFzRGhOFBkW8k7kA/v Mg6+pWKiBjFoy8g0FWTnV8YxZXitKK+4JJ7x6E9FwnKc6ok0PV7wQxo2hJtv49qotjarVg mPc+C3Qg9R2GRnOKhH6zkGdWHFu32aWhjrQHpbLer9XPcvl9idUQTzEymVOdGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NsjNq41sxz14dD; Wed, 11 Jan 2023 22:42:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30BMgJ9a035489; Wed, 11 Jan 2023 22:42:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30BMgJFe035488; Wed, 11 Jan 2023 22:42:19 GMT (envelope-from git) Date: Wed, 11 Jan 2023 22:42:19 GMT Message-Id: <202301112242.30BMgJFe035488@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Luca Pizzamiglio Subject: git: 93a86257b76d - main - component: Mk framework List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pizzamig X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93a86257b76dfc938ef0e37147e762b2605334ae Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pizzamig: URL: https://cgit.FreeBSD.org/ports/commit/?id=93a86257b76dfc938ef0e37147e762b2605334ae commit 93a86257b76dfc938ef0e37147e762b2605334ae Author: Luca Pizzamiglio AuthorDate: 2023-01-11 22:31:24 +0000 Commit: Luca Pizzamiglio CommitDate: 2023-01-11 22:41:24 +0000 component: Mk framework Add check to detect colon in .CURDIR, because it's not supported this patch detects the colon and shows a proper error message Reviewed By: #portmgr, tcberner Differential Revision: https://reviews.freebsd.org/D37500 --- Mk/bsd.port.mk | 5 +++++ Mk/bsd.port.subdir.mk | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 50c8be9ae4cd..7628e7d1d48a 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1058,6 +1058,11 @@ _PORTS_DIRECTORIES+= ${PKG_DBDIR} ${PREFIX} ${WRKDIR} ${EXTRACT_WRKDIR} \ # make -C /usr/ports/category/port/. .CURDIR:= ${.CURDIR:tA} +# Ensure .CURDIR doesn't contain a colon, which breaks makefile targets +.if ${.CURDIR:S/:/\:/g} != ${.CURDIR} +.error The current directory path contains ':', this is not supported +.endif + # make sure bmake treats -V as expected .MAKE.EXPAND_VARIABLES= yes diff --git a/Mk/bsd.port.subdir.mk b/Mk/bsd.port.subdir.mk index 426c64520f1d..724fa4505f53 100644 --- a/Mk/bsd.port.subdir.mk +++ b/Mk/bsd.port.subdir.mk @@ -51,6 +51,11 @@ MOVEDFILE?= MOVED # make -C /usr/ports/category/port/. .CURDIR:= ${.CURDIR:tA} +# Ensure .CURDIR doesn't contain a colon, which breaks makefile targets +.if ${.CURDIR:S/:/\:/g} != ${.CURDIR} +.error The current directory path contains ':', this is not supported +.endif + .include "${PORTSDIR}/Mk/bsd.commands.mk" .MAIN: all @@ -505,7 +510,7 @@ _PORTSEARCH= \ } \ }' ${MOVEDDIR}/${MOVEDFILE}; \ fi \ - fi + fi search: @${_PORTSEARCH}