CVS commit: pkgsrc/lang

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Sat Jun  4 00:34:31 UTC 2022

Modified Files:
        pkgsrc/lang/wasi-compiler-rt: buildlink3.mk
        pkgsrc/lang/wasi-libcxx: buildlink3.mk

Log Message:
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.)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/wasi-compiler-rt/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/wasi-libcxx/buildlink3.mk

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/buildlink3.mk
diff -u pkgsrc/lang/wasi-compiler-rt/buildlink3.mk:1.2 pkgsrc/lang/wasi-compiler-rt/buildlink3.mk:1.3
--- pkgsrc/lang/wasi-compiler-rt/buildlink3.mk:1.2      Fri Feb  4 12:12:27 2022
+++ pkgsrc/lang/wasi-compiler-rt/buildlink3.mk  Sat Jun  4 00:34:30 2022
@@ -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?=  b
 .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

Index: pkgsrc/lang/wasi-libcxx/buildlink3.mk
diff -u pkgsrc/lang/wasi-libcxx/buildlink3.mk:1.1 pkgsrc/lang/wasi-libcxx/buildlink3.mk:1.2
--- pkgsrc/lang/wasi-libcxx/buildlink3.mk:1.1   Sun Dec 19 14:12:20 2021
+++ pkgsrc/lang/wasi-libcxx/buildlink3.mk       Sat Jun  4 00:34:31 2022
@@ -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