From nobody Fri Sep 16 17:29:13 2022 X-Original-To: dev-commits-ports-all@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 4MTgzY71wZz4cd6F; Fri, 16 Sep 2022 17:29:13 +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 4MTgzY6Qrnz3wVd; Fri, 16 Sep 2022 17:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663349353; 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=Va7KB9h8AqDlrcF0kQxEa6SyfkXn+BIewygVHaGqwhg=; b=QFbvWrtTFCqNQWgEArh1YHNaOyRfUsGOc0ebeJtoWlsWIaI0Anq8pfgbkzbdT/tBTjyKcM b6Bvh2HL8Gdlj0rpHWq7fWf4ME4zW7UxbSECt9YyuuuiuSG69mYtNLEzl0ZY6mmwP7ZFzC dn+vrzZcUbTtU5lpwlNFxWMMn75jKmmTPF3ZoKeVv8KFw6x29ISrcI2Jpg8PWsP/gKc2oE eSjF1cLrwbjZf6JMSedi2o3sV9PYrgA6/dO4xLdeRbCzB9hPYTuQiOnn0BR+UASGWgJFB4 Bf8kc/C3/mx8LVcVqodT8ZE2gt2myMCKe3pgoTVqM10lN0F+aMdfLT2fIAPt4g== 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 4MTgzY5DswzQws; Fri, 16 Sep 2022 17:29:13 +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 28GHTD89000756; Fri, 16 Sep 2022 17:29:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28GHTDiW000755; Fri, 16 Sep 2022 17:29:13 GMT (envelope-from git) Date: Fri, 16 Sep 2022 17:29:13 GMT Message-Id: <202209161729.28GHTDiW000755@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: 25e93187069e - main - devel/llvm-devel: fix name collision List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25e93187069e74c4050dd39f1f38075a8b597b2c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663349353; 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=Va7KB9h8AqDlrcF0kQxEa6SyfkXn+BIewygVHaGqwhg=; b=vJBnSJCyePpps6y8Dx1UPO0yV25hK6YK8YeqnEiUvfkZ4ydXzwvGZDu2g6KgPaheZJIL5S jX+XRXkz4oO0xksF0EzfPkQpTjMaJMYsIthqF0GXY3mI3RZPCkQP5fKNwDtuw3e/TPqeyH IX0yptLWLC63bJOgCFctvL+NFUoERj7hgptPlgW3XqQh5TfVV6aO6FgqgZHJlKccrcz3RR uHAxwvmwAFxY1Sm0H5fhpPtwX/c7d00YvEvUgJH7WtrULWeMPwhUmHekZhlCwKYWAqrcvI Qs3Qj4b4vnwtQUO6XEnA6xKa09bCQ83PlMdlYy/1SkqA1pF3AJExaXShvC7glg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663349353; a=rsa-sha256; cv=none; b=rOedm2f1cdcsQCWk87pvhEJiDGqDvemPX0lt6FKYErV9HKxa0i5SzvkQIzBB93R4znieb7 yBgo7NgCFSBrhCJG69W2bCGtsGMLXKO7EP6azDtD8Ly9jkW+NClUa4LX8EFIDjApRDwGBt CPbKDIaiqBUXT9DDz6cgqxsNWDDuArSlmv6vDyv60fr8qAlpDKjLR8mla9c9tJ6Bg4C5Qg 7cVCT44YN1MLNIiJO9kAExUgRatRC6NJ4197r+NnDqH9zee4GSk2FBjA8sdH0Z4xJ7hCg+ BWSKyg7WJVgIoL693R87FM8/2WoU54UFw6Z6TgzRurGkvo1O9JEVTCYZ1lsy+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=25e93187069e74c4050dd39f1f38075a8b597b2c commit 25e93187069e74c4050dd39f1f38075a8b597b2c Author: Brooks Davis AuthorDate: 2022-09-16 17:27:03 +0000 Commit: Brooks Davis CommitDate: 2022-09-16 17:28:52 +0000 devel/llvm-devel: fix name collision Use _COMPILER_RT_LIBS rather than COMPILER_RT_LIBS for the list of library paths installed by the COMPILER_RT option. This worked because it was added after bsd.port.options.mk, but triggered a bsd.sanity.mk warning. PR: 266447 --- devel/llvm-devel/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index 77b4d11bf92b..e9ae8881b277 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -131,7 +131,7 @@ CLANG_USE= PERL5=run .endif COMPILER_RT_DESC= Sanitizer libraries COMPILER_RT_IMPLIES= CLANG -COMPILER_RT_PLIST_FILES=${COMPILER_RT_LIBS} \ +COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS} \ ${COMPILER_RT_IGNORELISTS:S|^|${_CRTBLDIR}/|} DOCS_PORTDOCS= llvm DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx-markdown-tables>=0:textproc/py-sphinx-markdown-tables@${PY_FLAVOR} \ @@ -340,9 +340,9 @@ _CRTLIBDIR= ${_CRTBASEDIR}/lib .include "Makefile.RUNTIMES" -COMPILER_RT_LIBS= +_COMPILER_RT_LIBS= .for CRT_ARCH in ${COMPILER_RT_ARCHS} -COMPILER_RT_LIBS:= ${COMPILER_RT_LIBS} ${COMPILER_RT_LIBS_${CRT_ARCH}:S|^|${_CRTLIBDIR}/${CRT_ARCH}-portbld-${OPSYS:tl}${OSREL}/|} +_COMPILER_RT_LIBS:= ${_COMPILER_RT_LIBS} ${COMPILER_RT_LIBS_${CRT_ARCH}:S|^|${_CRTLIBDIR}/${CRT_ARCH}-portbld-${OPSYS:tl}${OSREL}/|} .endfor # Comment out plist entries for unsupported options.