diff options
| author | gutteridge <gutteridge@pkgsrc.org> | 2022-06-04 00:34:30 +0000 |
|---|---|---|
| committer | gutteridge <gutteridge@pkgsrc.org> | 2022-06-04 00:34:30 +0000 |
| commit | 7cfaedf162eaa844f12406a21ae0603b003c344b (patch) | |
| tree | 32d5f0d0d486ca6c24023516e48a91c9e25f97fc /lang | |
| parent | 57ec247aa793a7790f5a889ba7e93bee88aec0cc (diff) | |
| download | pkgsrc-7cfaedf162eaa844f12406a21ae0603b003c344b.tar.gz | |
wasi-compiler-rt & wasi-libcxx: build fix for firefox
BUILDLINK_API_DEPENDS must reflect the exact llvm version, as this is
necessary to force the wasi packages to match, or build failures will
occur, because various commands invoked in the Firefox build process
supply the exact clang version in their path. For instance:
wasm-ld: error: cannot open /usr/pkg/lib/clang/13.0.1/lib/wasi/libclang_rt.builtins-wasm32.a: No such file or directory
clang-13: error: linker command failed with exit code 1 (use -v to see invocation)
(No PKGREVISION bump of www/firefox required, as this is a build-only
dependency, and no other packages presently depend on these.)
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/wasi-compiler-rt/buildlink3.mk | 6 | ||||
| -rw-r--r-- | lang/wasi-libcxx/buildlink3.mk | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lang/wasi-compiler-rt/buildlink3.mk b/lang/wasi-compiler-rt/buildlink3.mk index aeb41c9e8b0..51706cd5797 100644 --- a/lang/wasi-compiler-rt/buildlink3.mk +++ b/lang/wasi-compiler-rt/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2022/02/04 12:12:27 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2022/06/04 00:34:30 gutteridge Exp $ BUILDLINK_TREE+= wasi-compiler-rt @@ -7,7 +7,9 @@ BUILDLINK_DEPMETHOD.wasi-compiler-rt?= build .if !defined(WASI_COMPILER_RT_BUILDLINK3_MK) WASI_COMPILER_RT_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.wasi-compiler-rt+= wasi-compiler-rt>=13.0.0 +# This exact version must be kept in sync with llvm, or firefox +# minimum build dependencies will be incorrect. +BUILDLINK_API_DEPENDS.wasi-compiler-rt+= wasi-compiler-rt>=13.0.1 BUILDLINK_PKGSRCDIR.wasi-compiler-rt?= ../../lang/wasi-compiler-rt .endif # WASI_COMPILER_RT_BUILDLINK3_MK diff --git a/lang/wasi-libcxx/buildlink3.mk b/lang/wasi-libcxx/buildlink3.mk index 8c711596b92..a61daf9c73c 100644 --- a/lang/wasi-libcxx/buildlink3.mk +++ b/lang/wasi-libcxx/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2021/12/19 14:12:20 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2022/06/04 00:34:31 gutteridge Exp $ BUILDLINK_TREE+= wasi-libcxx @@ -7,7 +7,9 @@ BUILDLINK_DEPMETHOD.wasi-libcxx?= build .if !defined(WASI_LIBCXX_BUILDLINK3_MK) WASI_LIBCXX_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.wasi-libcxx+= wasi-libcxx>=13.0.0 +# This exact version must be kept in sync with llvm, or firefox +# minimum build dependencies will be incorrect. +BUILDLINK_API_DEPENDS.wasi-libcxx+= wasi-libcxx>=13.0.1 BUILDLINK_PKGSRCDIR.wasi-libcxx?= ../../lang/wasi-libcxx .endif # WASI_LIBCXX_BUILDLINK3_MK |