[pkgsrc/trunk]: pkgsrc/lang/wasi-libcxx wasi-libcxx: carry over wasi-compiler...

[gutteridge <gutteridge%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fedad7d1b1c6
branches:  trunk
changeset: 371378:fedad7d1b1c6
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Mon Jan 10 02:10:04 2022 +0000

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

diffstat:

 lang/wasi-libcxx/Makefile |  11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diffs (25 lines):

diff -r e50aa800fd89 -r fedad7d1b1c6 lang/wasi-libcxx/Makefile
--- a/lang/wasi-libcxx/Makefile Mon Jan 10 01:46:21 2022 +0000
+++ b/lang/wasi-libcxx/Makefile Mon Jan 10 02:10:04 2022 +0000
@@ -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 @@
        ${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"