CVS commit: [pkgsrc-2021Q4] pkgsrc/lang/wasi-libcxx

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Thu Jan 13 19:53:12 UTC 2022

Modified Files:
        pkgsrc/lang/wasi-libcxx [pkgsrc-2021Q4]: Makefile

Log Message:
Pullup ticket #6565 - requested by gutteridge
lang/wasi-libcxx: build fix

Revisions pulled up:
- lang/wasi-libcxx/Makefile                                     1.8

---
   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.4.2.1 -r1.4.2.2 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.4.2.1 pkgsrc/lang/wasi-libcxx/Makefile:1.4.2.2
--- pkgsrc/lang/wasi-libcxx/Makefile:1.4.2.1    Sun Jan  9 20:10:55 2022
+++ pkgsrc/lang/wasi-libcxx/Makefile    Thu Jan 13 19:53:12 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4.2.1 2022/01/09 20:10:55 bsiegert Exp $
+# $NetBSD: Makefile,v 1.4.2.2 2022/01/13 19:53:12 bsiegert 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"