Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id B517E1A9239 for ; Wed, 22 Dec 2021 12:47:22 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id EDE4F84E57; Wed, 22 Dec 2021 12:47:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3722E84D2E for ; Wed, 22 Dec 2021 12:47:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 6kRYeh1cTb02 for ; Wed, 22 Dec 2021 12:47:20 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 89B8D84D0E for ; Wed, 22 Dec 2021 12:47:20 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 83414FAEC; Wed, 22 Dec 2021 12:47:20 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_164017724052240" MIME-Version: 1.0 Date: Wed, 22 Dec 2021 12:47:20 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/lang/wasi-libc To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20211222124720.83414FAEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_164017724052240 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Wed Dec 22 12:47:20 UTC 2021 Modified Files: pkgsrc/lang/wasi-libc: Makefile Log Message: wasi-libc: set CLANGBASE instead of PKG_CC/CXX Otherwise it breaks when user has CLANGBASE=/usr in mk.conf. Also set PKG_FAIL_REASON when llvm doesn't have llvm-target-webassembly. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/wasi-libc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_164017724052240 Content-Disposition: inline Content-Length: 1004 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/wasi-libc/Makefile diff -u pkgsrc/lang/wasi-libc/Makefile:1.1 pkgsrc/lang/wasi-libc/Makefile:1.2 --- pkgsrc/lang/wasi-libc/Makefile:1.1 Sun Dec 19 13:38:56 2021 +++ pkgsrc/lang/wasi-libc/Makefile Wed Dec 22 12:47:20 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2021/12/19 13:38:56 ryoon Exp $ +# $NetBSD: Makefile,v 1.2 2021/12/22 12:47:20 tnn Exp $ GITHUB_PROJECT= wasi-libc GITHUB_TAG= ad5133410f66b93a2381db5b542aad5e0964db96 @@ -36,10 +36,12 @@ MAKE_FLAGS+= INSTALL_DIR=${DESTDIR}${PRE BUILD_TARGET= finish PKGSRC_COMPILER= clang -PKG_CC= ${PREFIX}/bin/clang -PKG_CXX= ${PREFIX}/bin/clang++ +CLANGBASE= ${PREFIX} BUILDLINK_DEPMETHOD.clang= build .include "../../lang/clang/buildlink3.mk" BUILDLINK_DEPMETHOD.llvm= build .include "../../lang/llvm/buildlink3.mk" +.if empty(PKG_BUILD_OPTIONS.llvm:Mllvm-target-webassembly) +PKG_FAIL_REASON+= "llvm-target-webassembly PKG_OPTION must be enabled in lang/llvm" +.endif .include "../../mk/bsd.pkg.mk" --_----------=_164017724052240--