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 BFBD21A9239 for ; Mon, 10 Jan 2022 00:12:49 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 08ECE84E6E; Mon, 10 Jan 2022 00:12:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3D53D84E6E for ; Mon, 10 Jan 2022 00:00:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id i4_RCccXVPzi for ; Mon, 10 Jan 2022 00:00:05 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 94B9784E5C for ; Mon, 10 Jan 2022 00:00:05 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 9191EFB23; Mon, 10 Jan 2022 00:00:05 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1641772805133070" MIME-Version: 1.0 Date: Mon, 10 Jan 2022 00:00:05 +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: <20220110000005.9191EFB23@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1641772805133070 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Mon Jan 10 00:00:05 UTC 2022 Modified Files: pkgsrc/lang/wasi-libc: Makefile Log Message: wasi-libc: fix build on SunOS To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/wasi-libc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1641772805133070 Content-Disposition: inline Content-Length: 820 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.6 pkgsrc/lang/wasi-libc/Makefile:1.7 --- pkgsrc/lang/wasi-libc/Makefile:1.6 Sun Jan 9 23:42:03 2022 +++ pkgsrc/lang/wasi-libc/Makefile Mon Jan 10 00:00:05 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2022/01/09 23:42:03 tnn Exp $ +# $NetBSD: Makefile,v 1.7 2022/01/10 00:00:05 tnn Exp $ GITHUB_PROJECT= wasi-libc GITHUB_TAG= ad5133410f66b93a2381db5b542aad5e0964db96 @@ -37,6 +37,11 @@ MAKE_FLAGS+= WASM_NM=${PREFIX}/bin/llvm- MAKE_FLAGS+= INSTALL_DIR=${DESTDIR}${PREFIX}/wasi BUILD_TARGET= finish +# iconv.h from libiconv get pulled in on SunOS (via clang) +# It conflicts with musl libc so must be removed. +pre-configure: + rm -f ${BUILDLINK_DIR}/include/iconv.h + ABI= # 32 CFLAGS= -O2 CXXFLAGS= -O2 --_----------=_1641772805133070--