CVS commit: pkgsrc/lang/wasi-libcxx

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

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Mon Jan 10 02:10:04 UTC 2022

Modified Files:
        pkgsrc/lang/wasi-libcxx: Makefile

Log Message:
wasi-libcxx: carry over wasi-compiler-rt fix for Firefox builds

Also apply tnn@'s workaround in wasi-compiler-rt here, as related
failures have been observed due to this package. See PR pkg/56590.
(Tested with multiple iterations on NetBSD 9.2_STABLE.)


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 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-libcxx/Makefile
diff -u pkgsrc/lang/wasi-libcxx/Makefile:1.7 pkgsrc/lang/wasi-libcxx/Makefile:1.8
--- pkgsrc/lang/wasi-libcxx/Makefile:1.7        Fri Jan  7 15:49:53 2022
+++ pkgsrc/lang/wasi-libcxx/Makefile    Mon Jan 10 02:10:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2022/01/07 15:49:53 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2022/01/10 02:10:04 gutteridge Exp $
 
 .include "../../lang/llvm/version.mk"
 
@@ -167,6 +167,15 @@ do-configure:
        ${PKGSRC_SETENV} ${_CONFIGURE_CMAKE_ENV} \
                cmake ${CMAKE_ARGS} ../libcxxabi
 
+# Run llvm-ranlib again on the archives. Fixes mystery build failure
+# in Firefox due to missing index (see PR pkg/56590). Might be a MAKE_JOBS
+# problem in this package?
+post-install:
+       ${PREFIX}/bin/llvm-ranlib \
+         ${DESTDIR}${PREFIX}/wasi/lib/wasm32-wasi/libc++.a
+       ${PREFIX}/bin/llvm-ranlib \
+         ${DESTDIR}${PREFIX}/wasi/lib/wasm32-wasi/libc++abi.a
+
 .include "../../lang/llvm/buildlink3.mk"
 .include "../../lang/wasi-libc/buildlink3.mk"
 .include "../../lang/wasi-compiler-rt/buildlink3.mk"