Fri Jan 7 14:33:43 2022 UTC ()
wasi-*: fix build failure when package already installed

Only use headers that pkgsrc has permitted via buildlink.


(tnn)
diff -r1.5 -r1.6 pkgsrc/lang/wasi-compiler-rt/Makefile
diff -r1.5 -r1.6 pkgsrc/lang/wasi-libcxx/Makefile
cvs diff -r1.5 -r1.6 pkgsrc/lang/wasi-compiler-rt/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/wasi-compiler-rt/Makefile 2022/01/07 13:51:05 1.5
+++ pkgsrc/lang/wasi-compiler-rt/Makefile 2022/01/07 14:33:43 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.5 2022/01/07 13:51:05 tnn Exp $ 1# $NetBSD: Makefile,v 1.6 2022/01/07 14:33:43 tnn Exp $
2 2
3.include "../../lang/llvm/version.mk" 3.include "../../lang/llvm/version.mk"
4 4
5DISTNAME= compiler-rt-${LLVM_VERSION}.src 5DISTNAME= compiler-rt-${LLVM_VERSION}.src
6PKGNAME= ${DISTNAME:S/.src//:S/compiler-rt-/wasi-compiler-rt-/} 6PKGNAME= ${DISTNAME:S/.src//:S/compiler-rt-/wasi-compiler-rt-/}
7CATEGORIES= lang devel 7CATEGORIES= lang devel
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://compiler-rt.llvm.org/ 10HOMEPAGE= https://compiler-rt.llvm.org/
11COMMENT= LLVM runtime libraries for WASI/WebAssembly 11COMMENT= LLVM runtime libraries for WASI/WebAssembly
12LICENSE= apache-2.0 12LICENSE= apache-2.0
13 13
14PATCHDIR= ${.CURDIR}/../../lang/compiler-rt/patches 14PATCHDIR= ${.CURDIR}/../../lang/compiler-rt/patches
@@ -29,27 +29,27 @@ CMAKE_ARG_PATH= ${WRKSRC}/lib/builtins @@ -29,27 +29,27 @@ CMAKE_ARG_PATH= ${WRKSRC}/lib/builtins
29BUILDLINK_TRANSFORM+= rm:-I/usr/include 29BUILDLINK_TRANSFORM+= rm:-I/usr/include
30BUILDLINK_TRANSFORM+= rm:-I${PREFIX}/include 30BUILDLINK_TRANSFORM+= rm:-I${PREFIX}/include
31 31
32CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=1 32CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=1
33 33
34CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release 34CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
35CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q} 35CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
36CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q} 36CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
37CMAKE_ARGS+= -DCOMPILER_RT_TEST_COMPILER=${CC:Q} 37CMAKE_ARGS+= -DCOMPILER_RT_TEST_COMPILER=${CC:Q}
38CMAKE_ARGS+= -DCOMPILER_RT_OS_DIR:STRING=wasi 38CMAKE_ARGS+= -DCOMPILER_RT_OS_DIR:STRING=wasi
39CMAKE_ARGS+= -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q} 39CMAKE_ARGS+= -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
40CMAKE_ARGS+= -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=wasm32-wasi 40CMAKE_ARGS+= -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=wasm32-wasi
41CMAKE_ARGS+= -DCOMPILER_RT_BAREMETAL_BUILD=TRUE 41CMAKE_ARGS+= -DCOMPILER_RT_BAREMETAL_BUILD=TRUE
42CMAKE_ARGS+= -DCMAKE_SYSROOT=${PREFIX}/wasi 42CMAKE_ARGS+= -DCMAKE_SYSROOT=${BUILDLINK_DIR}/wasi
43CMAKE_ARGS+= -DCOMPILER_RT_BAREMETAL_BUILD=TRUE 43CMAKE_ARGS+= -DCOMPILER_RT_BAREMETAL_BUILD=TRUE
44CMAKE_ARGS+= -DCOMPILER_RT_EXCLUDE_ATOMIC_BUILTIN=TRUE 44CMAKE_ARGS+= -DCOMPILER_RT_EXCLUDE_ATOMIC_BUILTIN=TRUE
45CMAKE_ARGS+= -DCOMPILER_RT_HAS_FPIC_FLAG:BOOL=ON 45CMAKE_ARGS+= -DCOMPILER_RT_HAS_FPIC_FLAG:BOOL=ON
46CMAKE_ARGS+= -DCOMPILER_RT_HAS_FPIE_FLAG:BOOL=ON 46CMAKE_ARGS+= -DCOMPILER_RT_HAS_FPIE_FLAG:BOOL=ON
47CMAKE_ARGS+= -DCOMPILER_RT_HAS_FNO_BUILTIN_FLAG:BOOL=ON 47CMAKE_ARGS+= -DCOMPILER_RT_HAS_FNO_BUILTIN_FLAG:BOOL=ON
48CMAKE_ARGS+= -DCOMPILER_RT_HAS_STD_C11_FLAG:BOOL=ON 48CMAKE_ARGS+= -DCOMPILER_RT_HAS_STD_C11_FLAG:BOOL=ON
49CMAKE_ARGS+= -DCOMPILER_RT_HAS_VISIBILITY_HIDDEN_FLAG:BOOL=ON 49CMAKE_ARGS+= -DCOMPILER_RT_HAS_VISIBILITY_HIDDEN_FLAG:BOOL=ON
50CMAKE_ARGS+= -DCOMPILER_RT_HAS_FREESTANDING_FLAG:BOOL=ON 50CMAKE_ARGS+= -DCOMPILER_RT_HAS_FREESTANDING_FLAG:BOOL=ON
51CMAKE_ARGS+= -DCOMPILER_RT_HAS_XRAY_COMPILER_FLAG:BOOL=OFF 51CMAKE_ARGS+= -DCOMPILER_RT_HAS_XRAY_COMPILER_FLAG:BOOL=OFF
52CMAKE_ARGS+= -DCOMPILER_RT_HAS_ATOMIC_KEYWORD:BOOL=ON 52CMAKE_ARGS+= -DCOMPILER_RT_HAS_ATOMIC_KEYWORD:BOOL=ON
53CMAKE_ARGS+= -DCOMPILER_RT_HAS_FLOAT16:BOOL=OFF 53CMAKE_ARGS+= -DCOMPILER_RT_HAS_FLOAT16:BOOL=OFF
54CMAKE_ARGS+= -DCOMPILER_RT_HAS_ASM_LSE:BOOL=OFF 54CMAKE_ARGS+= -DCOMPILER_RT_HAS_ASM_LSE:BOOL=OFF
55CMAKE_ARGS+= -DCMAKE_C_COMPILER_WORKS=1 # Do not test clang compile 55CMAKE_ARGS+= -DCMAKE_C_COMPILER_WORKS=1 # Do not test clang compile
cvs diff -r1.5 -r1.6 pkgsrc/lang/wasi-libcxx/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/wasi-libcxx/Makefile 2022/01/07 13:32:48 1.5
+++ pkgsrc/lang/wasi-libcxx/Makefile 2022/01/07 14:33:43 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.5 2022/01/07 13:32:48 tnn Exp $ 1# $NetBSD: Makefile,v 1.6 2022/01/07 14:33:43 tnn Exp $
2 2
3.include "../../lang/llvm/version.mk" 3.include "../../lang/llvm/version.mk"
4 4
5DISTNAME= libcxxabi-${LLVM_VERSION}.src 5DISTNAME= libcxxabi-${LLVM_VERSION}.src
6PKGNAME= ${DISTNAME:S/.src//:S/libcxxabi-/wasi-libcxx-/} 6PKGNAME= ${DISTNAME:S/.src//:S/libcxxabi-/wasi-libcxx-/}
7CATEGORIES= lang devel 7CATEGORIES= lang devel
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://libcxxabi.llvm.org/ 10HOMEPAGE= https://libcxxabi.llvm.org/
11COMMENT= C++ Standard Librares (libc++/libc++abi) for WASI/WebAssembly 11COMMENT= C++ Standard Librares (libc++/libc++abi) for WASI/WebAssembly
12LICENSE= apache-2.0 12LICENSE= apache-2.0
13 13
14# libcxx requires libcxxabi's cxxabi.h to build, but libcxxabi requires 14# libcxx requires libcxxabi's cxxabi.h to build, but libcxxabi requires
@@ -42,27 +42,27 @@ PKGSRC_USE_STACK_CHECK= no @@ -42,27 +42,27 @@ PKGSRC_USE_STACK_CHECK= no
42 42
43CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=1 43CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=1
44 44
45CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release 45CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
46CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q} 46CMAKE_ARGS+= -DCMAKE_C_COMPILER=${CC:Q}
47CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q} 47CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=${CXX:Q}
48CMAKE_ARGS+= -DLIBCXXABI_LIBCXX_INCLUDES=${WRKDIR}/${LIBCXX}/include 48CMAKE_ARGS+= -DLIBCXXABI_LIBCXX_INCLUDES=${WRKDIR}/${LIBCXX}/include
49CMAKE_ARGS+= -DLIBCXXABI_USE_LLVM_UNWINDER=ON 49CMAKE_ARGS+= -DLIBCXXABI_USE_LLVM_UNWINDER=ON
50CMAKE_ARGS+= -DCMAKE_C_COMPILER_WORKS=1 50CMAKE_ARGS+= -DCMAKE_C_COMPILER_WORKS=1
51CMAKE_ARGS+= -DCMAKE_CXX_COMPILER_WORKS=1 51CMAKE_ARGS+= -DCMAKE_CXX_COMPILER_WORKS=1
52CMAKE_ARGS+= -DCXX_SUPPORTS_CXX11=ON 52CMAKE_ARGS+= -DCXX_SUPPORTS_CXX11=ON
53CMAKE_ARGS+= -DLLVM_COMPILER_CHECKED=ON 53CMAKE_ARGS+= -DLLVM_COMPILER_CHECKED=ON
54CMAKE_ARGS+= -DUNIX:BOOL=ON 54CMAKE_ARGS+= -DUNIX:BOOL=ON
55CMAKE_ARGS+= -DCMAKE_SYSROOT=${PREFIX}/wasi 55CMAKE_ARGS+= -DCMAKE_SYSROOT=${BUILDLINK_DIR}/wasi
56CMAKE_ARGS+= -DCMAKE_CXX_COMPILER_TARGET=wasm32-wasi 56CMAKE_ARGS+= -DCMAKE_CXX_COMPILER_TARGET=wasm32-wasi
57CMAKE_ARGS+= -DLLVM_CONFIG_PATH=${PREFIX}/bin/llvm-config 57CMAKE_ARGS+= -DLLVM_CONFIG_PATH=${PREFIX}/bin/llvm-config
58CMAKE_ARGS+= -DLIBCXX_LIBDIR_SUFFIX=/wasm32-wasi 58CMAKE_ARGS+= -DLIBCXX_LIBDIR_SUFFIX=/wasm32-wasi
59CMAKE_ARGS+= -DLIBCXX_INCLUDE_BENCHMARKS:BOOL=FALSE 59CMAKE_ARGS+= -DLIBCXX_INCLUDE_BENCHMARKS:BOOL=FALSE
60CMAKE_ARGS+= -DLIBCXX_INCLUDE_TESTS:BOOL=FALSE 60CMAKE_ARGS+= -DLIBCXX_INCLUDE_TESTS:BOOL=FALSE
61CMAKE_ARGS+= -DLIBCXX_ENABLE_THREADS:BOOL=OFF 61CMAKE_ARGS+= -DLIBCXX_ENABLE_THREADS:BOOL=OFF
62CMAKE_ARGS+= -DLIBCXX_HAS_PTHREAD_API:BOOL=OFF 62CMAKE_ARGS+= -DLIBCXX_HAS_PTHREAD_API:BOOL=OFF
63CMAKE_ARGS+= -DLIBCXX_HAS_EXTERNAL_THREAD_API:BOOL=OFF 63CMAKE_ARGS+= -DLIBCXX_HAS_EXTERNAL_THREAD_API:BOOL=OFF
64CMAKE_ARGS+= -DLIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF 64CMAKE_ARGS+= -DLIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF
65CMAKE_ARGS+= -DLIBCXX_HAS_WIN32_THREAD_API:BOOL=OFF 65CMAKE_ARGS+= -DLIBCXX_HAS_WIN32_THREAD_API:BOOL=OFF
66CMAKE_ARGS+= -DLIBCXX_ENABLE_SHARED:BOOL=OFF 66CMAKE_ARGS+= -DLIBCXX_ENABLE_SHARED:BOOL=OFF
67CMAKE_ARGS+= -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY:BOOL=OFF 67CMAKE_ARGS+= -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY:BOOL=OFF
68CMAKE_ARGS+= -DLIBCXX_ENABLE_EXCEPTIONS:BOOL=OFF 68CMAKE_ARGS+= -DLIBCXX_ENABLE_EXCEPTIONS:BOOL=OFF