pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang wasi-*: force ABI=32



details:   https://anonhg.NetBSD.org/pkgsrc/rev/90a2a164d701
branches:  trunk
changeset: 371225:90a2a164d701
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri Jan 07 13:32:47 2022 +0000

description:
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.

diffstat:

 lang/wasi-compiler-rt/Makefile |  5 ++++-
 lang/wasi-libc/Makefile        |  3 ++-
 lang/wasi-libcxx/Makefile      |  3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diffs (53 lines):

diff -r 9e9773afa928 -r 90a2a164d701 lang/wasi-compiler-rt/Makefile
--- a/lang/wasi-compiler-rt/Makefile    Fri Jan 07 13:18:53 2022 +0000
+++ b/lang/wasi-compiler-rt/Makefile    Fri Jan 07 13:32:47 2022 +0000
@@ -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 @@
 post-extract:
        ${MKDIR} ${WRKDIR}/build
 
+.include "../../mk/bsd.prefs.mk"
+
+ABI=                   32
 PKGSRC_COMPILER=       clang
 CLANGBASE=             ${PREFIX}
 BUILDLINK_DEPMETHOD.clang=     build
diff -r 9e9773afa928 -r 90a2a164d701 lang/wasi-libc/Makefile
--- a/lang/wasi-libc/Makefile   Fri Jan 07 13:18:53 2022 +0000
+++ b/lang/wasi-libc/Makefile   Fri Jan 07 13:32:47 2022 +0000
@@ -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+=   INSTALL_DIR=${DESTDIR}${PREFIX}/wasi
 BUILD_TARGET=  finish
 
+ABI=                   32
 PKGSRC_COMPILER=       clang
 CLANGBASE=             ${PREFIX}
 BUILDLINK_DEPMETHOD.clang=     build
diff -r 9e9773afa928 -r 90a2a164d701 lang/wasi-libcxx/Makefile
--- a/lang/wasi-libcxx/Makefile Fri Jan 07 13:18:53 2022 +0000
+++ b/lang/wasi-libcxx/Makefile Fri Jan 07 13:32:47 2022 +0000
@@ -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 @@
 .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



Home | Main Index | Thread Index | Old Index