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 9E68D1A9239 for ; Fri, 7 Jan 2022 15:49:55 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id D264E84D84; Fri, 7 Jan 2022 15:49:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1760D84D40 for ; Fri, 7 Jan 2022 15:49:54 +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 9zL7Zn9Ofa8B for ; Fri, 7 Jan 2022 15:49:53 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 81DEC84CE8 for ; Fri, 7 Jan 2022 15:49:53 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7A5AAFAEC; Fri, 7 Jan 2022 15:49:53 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1641570593251550" MIME-Version: 1.0 Date: Fri, 7 Jan 2022 15:49:53 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/lang To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20220107154953.7A5AAFAEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1641570593251550 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Fri Jan 7 15:49:53 UTC 2022 Modified Files: pkgsrc/lang/wasi-compiler-rt: Makefile pkgsrc/lang/wasi-libc: Makefile pkgsrc/lang/wasi-libcxx: Makefile Log Message: wasi-*: eliminate -march and/or -mcpu CFLAGS user might have set Random CFLAGS from mk.conf are not a good idea in a cross compile scenario. Also reset ABI to empty string since -m32 can break some native CMake tests. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/wasi-compiler-rt/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/wasi-libc/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/wasi-libcxx/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1641570593251550 Content-Disposition: inline Content-Length: 2133 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/wasi-compiler-rt/Makefile diff -u pkgsrc/lang/wasi-compiler-rt/Makefile:1.6 pkgsrc/lang/wasi-compiler-rt/Makefile:1.7 --- pkgsrc/lang/wasi-compiler-rt/Makefile:1.6 Fri Jan 7 14:33:43 2022 +++ pkgsrc/lang/wasi-compiler-rt/Makefile Fri Jan 7 15:49:53 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2022/01/07 14:33:43 tnn Exp $ +# $NetBSD: Makefile,v 1.7 2022/01/07 15:49:53 tnn Exp $ .include "../../lang/llvm/version.mk" @@ -62,7 +62,9 @@ post-extract: .include "../../mk/bsd.prefs.mk" -ABI= 32 +ABI= # 32 +CFLAGS= -O2 +CXXFLAGS= -O2 PKGSRC_COMPILER= clang CLANGBASE= ${PREFIX} BUILDLINK_DEPMETHOD.clang= build Index: pkgsrc/lang/wasi-libc/Makefile diff -u pkgsrc/lang/wasi-libc/Makefile:1.4 pkgsrc/lang/wasi-libc/Makefile:1.5 --- pkgsrc/lang/wasi-libc/Makefile:1.4 Fri Jan 7 13:32:48 2022 +++ pkgsrc/lang/wasi-libc/Makefile Fri Jan 7 15:49:53 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2022/01/07 13:32:48 tnn Exp $ +# $NetBSD: Makefile,v 1.5 2022/01/07 15:49:53 tnn Exp $ GITHUB_PROJECT= wasi-libc GITHUB_TAG= ad5133410f66b93a2381db5b542aad5e0964db96 @@ -36,7 +36,9 @@ MAKE_FLAGS+= WASM_NM=${PREFIX}/bin/llvm- MAKE_FLAGS+= INSTALL_DIR=${DESTDIR}${PREFIX}/wasi BUILD_TARGET= finish -ABI= 32 +ABI= # 32 +CFLAGS= -O2 +CXXFLAGS= -O2 PKGSRC_COMPILER= clang CLANGBASE= ${PREFIX} BUILDLINK_DEPMETHOD.clang= build Index: pkgsrc/lang/wasi-libcxx/Makefile diff -u pkgsrc/lang/wasi-libcxx/Makefile:1.6 pkgsrc/lang/wasi-libcxx/Makefile:1.7 --- pkgsrc/lang/wasi-libcxx/Makefile:1.6 Fri Jan 7 14:33:43 2022 +++ pkgsrc/lang/wasi-libcxx/Makefile Fri Jan 7 15:49:53 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2022/01/07 14:33:43 tnn Exp $ +# $NetBSD: Makefile,v 1.7 2022/01/07 15:49:53 tnn Exp $ .include "../../lang/llvm/version.mk" @@ -170,7 +170,9 @@ do-configure: .include "../../lang/llvm/buildlink3.mk" .include "../../lang/wasi-libc/buildlink3.mk" .include "../../lang/wasi-compiler-rt/buildlink3.mk" -ABI= 32 +ABI= # 32 +CFLAGS= -O2 +CXXFLAGS= -O2 PKGSRC_COMPILER= clang CLANGBASE= ${PREFIX} BUILDLINK_DEPMETHOD.clang= build --_----------=_1641570593251550--