CVS commit: pkgsrc/lang

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Jan  7 13:32:48 UTC 2022

Modified Files:
        pkgsrc/lang/wasi-compiler-rt: Makefile
        pkgsrc/lang/wasi-libc: Makefile
        pkgsrc/lang/wasi-libcxx: Makefile

Log Message:
wasi-*: force ABI=32

These packages were failing when ABI=64 in mk.conf, because then -m64 is
passed down to clang and WebAssembly currently only supports -m32.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/wasi-compiler-rt/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/wasi-libc/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/wasi-libcxx/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/wasi-compiler-rt/Makefile
diff -u pkgsrc/lang/wasi-compiler-rt/Makefile:1.3 pkgsrc/lang/wasi-compiler-rt/Makefile:1.4
--- pkgsrc/lang/wasi-compiler-rt/Makefile:1.3   Wed Dec 22 16:10:08 2021
+++ pkgsrc/lang/wasi-compiler-rt/Makefile       Fri Jan  7 13:32:47 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/12/22 16:10:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/07 13:32:47 tnn Exp $
 
 .include "../../lang/llvm/version.mk"
 
@@ -60,6 +60,9 @@ CMAKE_INSTALL_PREFIX= ${PREFIX}/lib/clan
 post-extract:
        ${MKDIR} ${WRKDIR}/build
 
+.include "../../mk/bsd.prefs.mk"
+
+ABI=                   32
 PKGSRC_COMPILER=       clang
 CLANGBASE=             ${PREFIX}
 BUILDLINK_DEPMETHOD.clang=     build

Index: pkgsrc/lang/wasi-libc/Makefile
diff -u pkgsrc/lang/wasi-libc/Makefile:1.3 pkgsrc/lang/wasi-libc/Makefile:1.4
--- pkgsrc/lang/wasi-libc/Makefile:1.3  Wed Dec 22 16:09:45 2021
+++ pkgsrc/lang/wasi-libc/Makefile      Fri Jan  7 13:32:48 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/12/22 16:09:45 ryoon Exp $
+# $NetBSD: Makefile,v 1.4 2022/01/07 13:32:48 tnn Exp $
 
 GITHUB_PROJECT=        wasi-libc
 GITHUB_TAG=    ad5133410f66b93a2381db5b542aad5e0964db96
@@ -36,6 +36,7 @@ MAKE_FLAGS+=  WASM_NM=${PREFIX}/bin/llvm-
 MAKE_FLAGS+=   INSTALL_DIR=${DESTDIR}${PREFIX}/wasi
 BUILD_TARGET=  finish
 
+ABI=                   32
 PKGSRC_COMPILER=       clang
 CLANGBASE=             ${PREFIX}
 BUILDLINK_DEPMETHOD.clang=     build

Index: pkgsrc/lang/wasi-libcxx/Makefile
diff -u pkgsrc/lang/wasi-libcxx/Makefile:1.4 pkgsrc/lang/wasi-libcxx/Makefile:1.5
--- pkgsrc/lang/wasi-libcxx/Makefile:1.4        Mon Dec 27 10:00:13 2021
+++ pkgsrc/lang/wasi-libcxx/Makefile    Fri Jan  7 13:32:48 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/12/27 10:00:13 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/07 13:32:48 tnn Exp $
 
 .include "../../lang/llvm/version.mk"
 
@@ -170,6 +170,7 @@ do-configure:
 .include "../../lang/llvm/buildlink3.mk"
 .include "../../lang/wasi-libc/buildlink3.mk"
 .include "../../lang/wasi-compiler-rt/buildlink3.mk"
+ABI=                   32
 PKGSRC_COMPILER=       clang
 CLANGBASE=             ${PREFIX}
 BUILDLINK_DEPMETHOD.clang=     build