Date: Monday, January 16, 2023 @ 11:17:54
Author: heftig
Revision: 1385677
15.0.7-2: remove unused options, fix compiler flag checks (fail when
libc++/libc++abi is not already installed and working, so we have a
bootstrapping problem)
Modified:
wasi-libc++/trunk/PKGBUILD
----------+
PKGBUILD | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++----------
1 file changed, 62 insertions(+), 12 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-01-16 11:16:22 UTC (rev 1385676)
+++ PKGBUILD 2023-01-16 11:17:54 UTC (rev 1385677)
@@ -3,11 +3,11 @@
pkgbase=wasi-libc++
pkgname=(wasi-libc++ wasi-libc++abi)
pkgver=15.0.7
-pkgrel=1
+pkgrel=2
arch=('any')
url='https://libcxx.llvm.org/'
license=('custom:Apache 2.0 with LLVM Exception')
-makedepends=('cmake' 'ninja' 'python' 'clang' 'llvm' 'wasi-libc'
'wasi-compiler-rt')
+makedepends=('cmake' 'ninja' 'python' 'clang' 'llvm' 'wasi-libc'
'wasi-compiler-rt' 'lld')
source=(https://github.com/llvm/llvm-project/releases/download/llvmorg-${pkgver}/llvm-project-${pkgver}.src.tar.xz{,.sig}
WASI.cmake
wasi-toolchain.cmake)
@@ -15,7 +15,7 @@
'SKIP'
'c829d807c257921fddb8c4d3752ad2291a2beb116d414dd31e34b7f6b01599d8c4807db87ef9930456ed8c9f30e8648e77028fa0b903c3a5ea840514f6022cf4'
'74c63bb838bc2e6d7980370fb3d47f8fd2f1dd8b6dc82302c7cc0b80e0fb1e8e21c1c62d6de0b78e478fc22611a5867e52b1ef7a566796fe831fffd98b17c940')
-options=('staticlibs')
+options=('staticlibs' '!lto' '!debug')
validpgpkeys=(
'474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard
<[email protected]>
'D574BD5D1D0E98895E3BF90044F2485E45D59042' # Tobias Hieta <[email protected]>
@@ -32,9 +32,9 @@
# Build options are derived from here
https://github.com/WebAssembly/wasi-sdk/blob/main/Makefile
# remove compiler options not supported by the wasm32-wasi target
export CFLAGS="$(echo $CFLAGS | sed "s/-mtune=generic//;
- s/-fstack-clash-protection//; s/-fcf-protection//")"
+ s/-fstack-clash-protection//; s/-fcf-protection//; s/-fexceptions//")"
export CXXFLAGS="$(echo $CXXFLAGS | sed "s/-mtune=generic//;
- s/-fstack-clash-protection//; s/-fcf-protection//")"
+ s/-fstack-clash-protection//; s/-fcf-protection//; s/-fexceptions//")"
cmake -B build -G Ninja \
-DCMAKE_C_COMPILER_WORKS=ON \
@@ -43,22 +43,18 @@
-DCMAKE_MODULE_PATH="${srcdir}"/cmake \
-DCMAKE_TOOLCHAIN_FILE="${srcdir}"/wasi-toolchain.cmake \
-DCMAKE_STAGING_PREFIX=/usr/share/wasi-sysroot \
- -DLLVM_CONFIG_PATH="${srcdir}"/build/llvm/bin/llvm-config \
- -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
- -DCXX_SUPPORTS_CXX11=ON \
-DLIBCXX_ENABLE_THREADS:BOOL=OFF \
-DLIBCXX_HAS_PTHREAD_API:BOOL=OFF \
-DLIBCXX_HAS_EXTERNAL_THREAD_API:BOOL=OFF \
-DLIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF \
-DLIBCXX_HAS_WIN32_THREAD_API:BOOL=OFF \
- -DLLVM_COMPILER_CHECKED=ON \
+ -DLLVM_COMPILER_CHECKED:BOOL=ON \
+ -DLLVM_RUNTIMES_LINKING_WORKS:BOOL=ON \
-DCMAKE_BUILD_TYPE=Release \
-DLIBCXX_ENABLE_SHARED:BOOL=OFF \
- -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY:BOOL=OFF \
-DLIBCXX_ENABLE_EXCEPTIONS:BOOL=OFF \
-DLIBCXX_ENABLE_FILESYSTEM:BOOL=OFF \
-DLIBCXX_CXX_ABI=libcxxabi \
- -DLIBCXX_CXX_ABI_INCLUDE_PATHS=llvm/libcxxabi/include \
-DLIBCXX_HAS_MUSL_LIBC:BOOL=ON \
-DLIBCXX_ABI_VERSION=2 \
-DLIBCXXABI_ENABLE_EXCEPTIONS:BOOL=OFF \
@@ -69,7 +65,6 @@
-DLIBCXXABI_HAS_EXTERNAL_THREAD_API:BOOL=OFF \
-DLIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF \
-DLIBCXXABI_HAS_WIN32_THREAD_API:BOOL=OFF \
- -DLIBCXXABI_ENABLE_PIC:BOOL=OFF \
-DWASI_SDK_PREFIX=/usr \
-DUNIX:BOOL=ON \
-DCMAKE_SYSROOT=/usr/share/wasi-sysroot \
@@ -76,6 +71,61 @@
-DLIBCXX_LIBDIR_SUFFIX=/wasm32-wasi \
-DLIBCXXABI_LIBDIR_SUFFIX=/wasm32-wasi \
-DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" \
+ -DCXX_SUPPORTS_CLASS_MEMACCESS_FLAG:BOOL=OFF \
+ -DCXX_SUPPORTS_COVERED_SWITCH_DEFAULT_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_EHA_FLAG:BOOL=OFF \
+ -DCXX_SUPPORTS_EHS_FLAG:BOOL=OFF \
+ -DCXX_SUPPORTS_FALIGNED_ALLOCATION_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_FDATA_SECTIONS:BOOL=ON \
+ -DCXX_SUPPORTS_FNO_EXCEPTIONS_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_FSTRICT_ALIASING_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_FVISIBILITY_EQ_HIDDEN_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_IMPLICIT_FALLTHROUGH_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_MISLEADING_INDENTATION_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_MISSING_FIELD_INITIALIZERS_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_NOEXCEPT_TYPE_FLAG:BOOL=OFF \
+ -DCXX_SUPPORTS_NOSTDINCXX_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_NOSTDLIBXX_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_PEDANTIC_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_STRING_CONVERSION_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_SUGGEST_OVERRIDE_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_UNWINDLIB_EQ_NONE_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WALL_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WCHAR_SUBSCRIPTS_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WCONVERSION_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WERROR_DATE_TIME:BOOL=ON \
+ -DCXX_SUPPORTS_WERROR_EQ_RETURN_TYPE_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WERROR_UNGUARDED_AVAILABILITY_NEW:BOOL=ON \
+ -DCXX_SUPPORTS_WEXTRA_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WEXTRA_SEMI_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WFORMAT_NONLITERAL_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WMISMATCHED_TAGS_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WMISSING_BRACES_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WNEWLINE_EOF_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WNO_COVERED_SWITCH_DEFAULT_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WNO_ERROR_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WNO_LONG_LONG_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WNO_SUGGEST_OVERRIDE_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WNO_UNUSED_PARAMETER_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WNO_USER_DEFINED_LITERALS_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WSHADOW_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WSHORTEN_64_TO_32_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WSIGN_COMPARE_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WSIGN_CONVERSION_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WSTRICT_ALIASING_EQ_2_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WSTRICT_OVERFLOW_EQ_4_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WUNDEF_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WUNUSED_FUNCTION_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WUNUSED_PARAMETER_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WUNUSED_VARIABLE_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WWRITE_STRINGS_FLAG:BOOL=ON \
+ -DCXX_SUPPORTS_WX_FLAG:BOOL=OFF \
+ -DCXX_SUPPORTS_W_FLAG:BOOL=ON \
+ -DCXX_WONT_WARN_ON_FINAL_NONVIRTUALDTOR:BOOL=ON \
+ -DCXX_WSUGGEST_OVERRIDE_ALLOWS_ONLY_FINAL:BOOL=ON \
+ -DLINKER_SUPPORTS_COLOR_DIAGNOSTICS:BOOL=ON \
+ -DSUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG:BOOL=ON \
llvm/runtimes
ninja -C build
