[arch-commits] Commit in wasi-libc++/repos/community-any (6 files)

Frederik Schwan freswa at gemini.archlinux.org
Tue Feb 8 15:28:35 UTC 2022


    Date: Tuesday, February 8, 2022 @ 15:28:35
  Author: freswa
Revision: 1129250

archrelease: copy trunk to community-any

Added:
  wasi-libc++/repos/community-any/PKGBUILD
    (from rev 1129249, wasi-libc++/trunk/PKGBUILD)
  wasi-libc++/repos/community-any/WASI.cmake
    (from rev 1129249, wasi-libc++/trunk/WASI.cmake)
  wasi-libc++/repos/community-any/wasi-toolchain.cmake
    (from rev 1129249, wasi-libc++/trunk/wasi-toolchain.cmake)
Deleted:
  wasi-libc++/repos/community-any/PKGBUILD
  wasi-libc++/repos/community-any/WASI.cmake
  wasi-libc++/repos/community-any/wasi-toolchain.cmake

----------------------+
 PKGBUILD             |  236 ++++++++++++++++++++++++-------------------------
 WASI.cmake           |    2 
 wasi-toolchain.cmake |   58 ++++++------
 3 files changed, 148 insertions(+), 148 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-08 15:28:32 UTC (rev 1129249)
+++ PKGBUILD	2022-02-08 15:28:35 UTC (rev 1129250)
@@ -1,118 +0,0 @@
-# Maintainer: Frederik Schwan <freswa at archlinux dot org>
-
-pkgbase=wasi-libc++
-pkgname=(wasi-libc++ wasi-libc++abi)
-pkgver=13.0.0
-pkgrel=2
-arch=('any')
-url='https://libcxx.llvm.org/'
-license=('custom:Apache 2.0 with LLVM Exception')
-makedepends=('cmake' 'ninja' 'python' 'llvm' 'clang' 'wasi-libc' 'wasi-compiler-rt')
-source=("https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-$pkgver.src.tar.xz"{,.sig}
-        "https://github.com/llvm/llvm-project/releases/download/llvmorg-${pkgver}/libcxx-${pkgver}.src.tar.xz"{,.sig}
-        "https://github.com/llvm/llvm-project/releases/download/llvmorg-${pkgver}/libcxxabi-${pkgver}.src.tar.xz"{,.sig}
-        WASI.cmake
-        wasi-toolchain.cmake)
-b2sums=('71d109343e407291461a25b139af86b26465c3cd75cfc3148132efddf8a68bec675c38369347eb6334d81c2cfcc48d31549c0937087e2df410f334ef62c0bfc9'
-        'SKIP'
-        'bf507449ee4b8c6fe6234e64a1b0e91a554bd252d953b8c24a92b660c00d0483c226f58abbef83c8c4cb22af0cf506a196510d48eee4ba6271d1475003826ea5'
-        'SKIP'
-        '75f8e5ae535d5c2a7e8b35ee87729a7e15ef1f8b6cdfcca381d262d1f96cac738328d5250676aa8e8df804a39aeee732f3c9aca625caa98167c98629a63e2778'
-        'SKIP'
-        'c829d807c257921fddb8c4d3752ad2291a2beb116d414dd31e34b7f6b01599d8c4807db87ef9930456ed8c9f30e8648e77028fa0b903c3a5ea840514f6022cf4'
-        '74c63bb838bc2e6d7980370fb3d47f8fd2f1dd8b6dc82302c7cc0b80e0fb1e8e21c1c62d6de0b78e478fc22611a5867e52b1ef7a566796fe831fffd98b17c940')
-options=('staticlibs')
-validpgpkeys+=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans at chromium.org>
-validpgpkeys+=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar at redhat.com>
-
-prepare() {
-  # Platform files have been copied from here https://github.com/WebAssembly/wasi-sdk
-  mkdir -p cmake/Platform
-  cp WASI.cmake cmake/Platform
-
-  mv libcxx-${pkgver}.src libcxx
-  mv libcxxabi-${pkgver}.src libcxxabi
-  mv llvm-${pkgver}.src llvm
-
-  sed -i 's/CREDITS.TXT/CREDITS/' libcxx/LICENSE.TXT libcxxabi/LICENSE.TXT
-}
-
-build() {
-  # Build options are derived from here https://github.com/WebAssembly/wasi-sdk/blob/main/Makefile
-
-  # Currently, wasi-sdk requires C++ code be compiled with -fno-exceptions. libc++abi is compiled, however is is currently compiled with exception-handling support disabled.
-  # https://github.com/WebAssembly/wasi-sdk/issues/52#issuecomment-530619365
-  cmake -B build-libcxx -G Ninja \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_C_COMPILER_WORKS=ON \
-    -DCMAKE_CXX_COMPILER_WORKS=ON \
-    -DCMAKE_MODULE_PATH="${srcdir}"/cmake \
-    -DCMAKE_TOOLCHAIN_FILE="${srcdir}"/wasi-toolchain.cmake \
-    -DCMAKE_STAGING_PREFIX=/usr/share/wasi-sysroot \
-    -DLIBCXX_ENABLE_EXCEPTIONS:BOOL=OFF \
-    -DLIBCXX_ENABLE_SHARED:BOOL=OFF \
-    -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 \
-    -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY:BOOL=OFF \
-    -DLIBCXX_ENABLE_FILESYSTEM:BOOL=OFF \
-    -DLIBCXX_CXX_ABI=libcxxabi \
-    -DLIBCXX_CXX_ABI_INCLUDE_PATHS=libcxxabi/include \
-    -DLIBCXX_HAS_MUSL_LIBC:BOOL=ON \
-    -DLIBCXX_ABI_VERSION=2 \
-    -DWASI_SDK_PREFIX=/usr \
-    -DCMAKE_C_FLAGS="-fno-exceptions --sysroot=/usr/share/wasi-sysroot" \
-    -DCMAKE_CXX_FLAGS="-fno-exceptions --sysroot=/usr/share/wasi-sysroot" \
-    -DLIBCXX_LIBDIR_SUFFIX=/wasm32-wasi \
-    libcxx
-  cmake --build build-libcxx -v
-
-  cmake -B build-libcxxabi -G Ninja \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_C_COMPILER_WORKS=ON \
-    -DCMAKE_CXX_COMPILER_WORKS=ON \
-    -DCMAKE_MODULE_PATH="${srcdir}"/cmake \
-    -DCMAKE_TOOLCHAIN_FILE="${srcdir}"/wasi-toolchain.cmake \
-    -DCMAKE_STAGING_PREFIX=/usr/share/wasi-sysroot \
-    -DLIBCXXABI_ENABLE_EXCEPTIONS:BOOL=OFF \
-    -DLIBCXXABI_ENABLE_SHARED:BOOL=OFF \
-    -DLIBCXXABI_ENABLE_THREADS:BOOL=OFF \
-    -DLIBCXXABI_HAS_PTHREAD_API:BOOL=OFF \
-    -DLIBCXXABI_HAS_EXTERNAL_THREAD_API:BOOL=OFF \
-    -DLIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF \
-    -DLIBCXXABI_HAS_WIN32_THREAD_API:BOOL=OFF \
-    -DLIBCXXABI_SILENT_TERMINATE:BOOL=ON \
-    -DLIBCXXABI_ENABLE_PIC:BOOL=OFF \
-    -DUNIX:BOOL=ON \
-    -DCXX_SUPPORTS_CXX11=ON \
-    -DLIBCXXABI_LIBCXX_PATH=libcxx \
-    -DLIBCXXABI_LIBCXX_INCLUDES="${srcdir}"/build-libcxx/include/c++/v1 \
-    -DWASI_SDK_PREFIX=/usr \
-    -DCMAKE_C_FLAGS="-fno-exceptions --sysroot=/usr/share/wasi-sysroot" \
-    -DCMAKE_CXX_FLAGS="-fno-exceptions --sysroot=/usr/share/wasi-sysroot" \
-    -DLIBCXXABI_LIBDIR_SUFFIX=/wasm32-wasi \
-    libcxxabi
-  cmake --build build-libcxxabi -v
-}
-
-# Do not remove the space before the () or commitpkg will
-# accidentally to run this function on the system (!!!) 
-package_wasi-libc++ () {
-  pkgdesc='WASI LLVM C++ standard library'
-
-  DESTDIR="${pkgdir}" cmake --install build-libcxx -v
-
-  install -Dm0644 libcxx/CREDITS.TXT "${pkgdir}"/usr/share/licenses/${pkgname}/CREDITS
-  install -Dm0644 libcxx/LICENSE.TXT "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
-
-package_wasi-libc++abi() {
-  pkgdesc='WASI Low level support for the LLVM C++ standard library.'
-
-  DESTDIR="${pkgdir}" cmake --install build-libcxxabi -v
-
-  install -Dm0644 libcxxabi/CREDITS.TXT "${pkgdir}"/usr/share/licenses/${pkgname}/CREDITS
-  install -Dm0644 libcxxabi/LICENSE.TXT "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}

Copied: wasi-libc++/repos/community-any/PKGBUILD (from rev 1129249, wasi-libc++/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-02-08 15:28:35 UTC (rev 1129250)
@@ -0,0 +1,118 @@
+# Maintainer: Frederik Schwan <freswa at archlinux dot org>
+
+pkgbase=wasi-libc++
+pkgname=(wasi-libc++ wasi-libc++abi)
+pkgver=13.0.1
+pkgrel=1
+arch=('any')
+url='https://libcxx.llvm.org/'
+license=('custom:Apache 2.0 with LLVM Exception')
+makedepends=('cmake' 'ninja' 'python' 'llvm' 'clang' 'wasi-libc' 'wasi-compiler-rt')
+source=("https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-$pkgver.src.tar.xz"{,.sig}
+        "https://github.com/llvm/llvm-project/releases/download/llvmorg-${pkgver}/libcxx-${pkgver}.src.tar.xz"{,.sig}
+        "https://github.com/llvm/llvm-project/releases/download/llvmorg-${pkgver}/libcxxabi-${pkgver}.src.tar.xz"{,.sig}
+        WASI.cmake
+        wasi-toolchain.cmake)
+b2sums=('ab03df73a391a354bf201ee919ca27c001b59b733d34a0be8e6728c18594ed0734d27f0e332a0ca1f6f4f7f2327f80f04ea297955945baf5b6a65363b083881f'
+        'SKIP'
+        '366cb3b1faa88e26754f1ce43f106900c8591d08871ea22344837904970dbc8ecdeb76113bab33e9d07d61c5a6e783ad0226fc042706200215effdf58a3f1ddd'
+        'SKIP'
+        'd6604a01d8b19b4da86b8fd6b5937af58ec3bd6bf8e49bc83fb2ee6a6c1449b1bcb0f9fb444cf35f5b099b8bbd642f475cff9784dbe335f135069ce5f4a8cc0a'
+        'SKIP'
+        'c829d807c257921fddb8c4d3752ad2291a2beb116d414dd31e34b7f6b01599d8c4807db87ef9930456ed8c9f30e8648e77028fa0b903c3a5ea840514f6022cf4'
+        '74c63bb838bc2e6d7980370fb3d47f8fd2f1dd8b6dc82302c7cc0b80e0fb1e8e21c1c62d6de0b78e478fc22611a5867e52b1ef7a566796fe831fffd98b17c940')
+options=('staticlibs')
+validpgpkeys+=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans at chromium.org>
+validpgpkeys+=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar at redhat.com>
+
+prepare() {
+  # Platform files have been copied from here https://github.com/WebAssembly/wasi-sdk
+  mkdir -p cmake/Platform
+  cp WASI.cmake cmake/Platform
+
+  mv libcxx-${pkgver}.src libcxx
+  mv libcxxabi-${pkgver}.src libcxxabi
+  mv llvm-${pkgver}.src llvm
+
+  sed -i 's/CREDITS.TXT/CREDITS/' libcxx/LICENSE.TXT libcxxabi/LICENSE.TXT
+}
+
+build() {
+  # Build options are derived from here https://github.com/WebAssembly/wasi-sdk/blob/main/Makefile
+
+  # Currently, wasi-sdk requires C++ code be compiled with -fno-exceptions. libc++abi is compiled, however is is currently compiled with exception-handling support disabled.
+  # https://github.com/WebAssembly/wasi-sdk/issues/52#issuecomment-530619365
+  cmake -B build-libcxx -G Ninja \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_C_COMPILER_WORKS=ON \
+    -DCMAKE_CXX_COMPILER_WORKS=ON \
+    -DCMAKE_MODULE_PATH="${srcdir}"/cmake \
+    -DCMAKE_TOOLCHAIN_FILE="${srcdir}"/wasi-toolchain.cmake \
+    -DCMAKE_STAGING_PREFIX=/usr/share/wasi-sysroot \
+    -DLIBCXX_ENABLE_EXCEPTIONS:BOOL=OFF \
+    -DLIBCXX_ENABLE_SHARED:BOOL=OFF \
+    -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 \
+    -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY:BOOL=OFF \
+    -DLIBCXX_ENABLE_FILESYSTEM:BOOL=OFF \
+    -DLIBCXX_CXX_ABI=libcxxabi \
+    -DLIBCXX_CXX_ABI_INCLUDE_PATHS=libcxxabi/include \
+    -DLIBCXX_HAS_MUSL_LIBC:BOOL=ON \
+    -DLIBCXX_ABI_VERSION=2 \
+    -DWASI_SDK_PREFIX=/usr \
+    -DCMAKE_C_FLAGS="-fno-exceptions --sysroot=/usr/share/wasi-sysroot" \
+    -DCMAKE_CXX_FLAGS="-fno-exceptions --sysroot=/usr/share/wasi-sysroot" \
+    -DLIBCXX_LIBDIR_SUFFIX=/wasm32-wasi \
+    libcxx
+  cmake --build build-libcxx -v
+
+  cmake -B build-libcxxabi -G Ninja \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_C_COMPILER_WORKS=ON \
+    -DCMAKE_CXX_COMPILER_WORKS=ON \
+    -DCMAKE_MODULE_PATH="${srcdir}"/cmake \
+    -DCMAKE_TOOLCHAIN_FILE="${srcdir}"/wasi-toolchain.cmake \
+    -DCMAKE_STAGING_PREFIX=/usr/share/wasi-sysroot \
+    -DLIBCXXABI_ENABLE_EXCEPTIONS:BOOL=OFF \
+    -DLIBCXXABI_ENABLE_SHARED:BOOL=OFF \
+    -DLIBCXXABI_ENABLE_THREADS:BOOL=OFF \
+    -DLIBCXXABI_HAS_PTHREAD_API:BOOL=OFF \
+    -DLIBCXXABI_HAS_EXTERNAL_THREAD_API:BOOL=OFF \
+    -DLIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF \
+    -DLIBCXXABI_HAS_WIN32_THREAD_API:BOOL=OFF \
+    -DLIBCXXABI_SILENT_TERMINATE:BOOL=ON \
+    -DLIBCXXABI_ENABLE_PIC:BOOL=OFF \
+    -DUNIX:BOOL=ON \
+    -DCXX_SUPPORTS_CXX11=ON \
+    -DLIBCXXABI_LIBCXX_PATH=libcxx \
+    -DLIBCXXABI_LIBCXX_INCLUDES="${srcdir}"/build-libcxx/include/c++/v1 \
+    -DWASI_SDK_PREFIX=/usr \
+    -DCMAKE_C_FLAGS="-fno-exceptions --sysroot=/usr/share/wasi-sysroot" \
+    -DCMAKE_CXX_FLAGS="-fno-exceptions --sysroot=/usr/share/wasi-sysroot" \
+    -DLIBCXXABI_LIBDIR_SUFFIX=/wasm32-wasi \
+    libcxxabi
+  cmake --build build-libcxxabi -v
+}
+
+# Do not remove the space before the () or commitpkg will
+# accidentally to run this function on the system (!!!) 
+package_wasi-libc++ () {
+  pkgdesc='WASI LLVM C++ standard library'
+
+  DESTDIR="${pkgdir}" cmake --install build-libcxx -v
+
+  install -Dm0644 libcxx/CREDITS.TXT "${pkgdir}"/usr/share/licenses/${pkgname}/CREDITS
+  install -Dm0644 libcxx/LICENSE.TXT "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
+
+package_wasi-libc++abi() {
+  pkgdesc='WASI Low level support for the LLVM C++ standard library.'
+
+  DESTDIR="${pkgdir}" cmake --install build-libcxxabi -v
+
+  install -Dm0644 libcxxabi/CREDITS.TXT "${pkgdir}"/usr/share/licenses/${pkgname}/CREDITS
+  install -Dm0644 libcxxabi/LICENSE.TXT "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}

Deleted: WASI.cmake
===================================================================
--- WASI.cmake	2022-02-08 15:28:32 UTC (rev 1129249)
+++ WASI.cmake	2022-02-08 15:28:35 UTC (rev 1129250)
@@ -1 +0,0 @@
-set(WASI 1)

Copied: wasi-libc++/repos/community-any/WASI.cmake (from rev 1129249, wasi-libc++/trunk/WASI.cmake)
===================================================================
--- WASI.cmake	                        (rev 0)
+++ WASI.cmake	2022-02-08 15:28:35 UTC (rev 1129250)
@@ -0,0 +1 @@
+set(WASI 1)

Deleted: wasi-toolchain.cmake
===================================================================
--- wasi-toolchain.cmake	2022-02-08 15:28:32 UTC (rev 1129249)
+++ wasi-toolchain.cmake	2022-02-08 15:28:35 UTC (rev 1129250)
@@ -1,29 +0,0 @@
-# Cmake toolchain description file for the Makefile
-
-# This is arbitrary, AFAIK, for now.
-cmake_minimum_required(VERSION 3.4.0)
-
-set(CMAKE_SYSTEM_NAME WASI)
-set(CMAKE_SYSTEM_VERSION 1)
-set(CMAKE_SYSTEM_PROCESSOR wasm32)
-set(triple wasm32-wasi)
-
-if(WIN32)
-  set(WASI_HOST_EXE_SUFFIX ".exe")
-else()
-  set(WASI_HOST_EXE_SUFFIX "")
-endif()
-
-set(CMAKE_C_COMPILER ${WASI_SDK_PREFIX}/bin/clang${WASI_HOST_EXE_SUFFIX})
-set(CMAKE_CXX_COMPILER ${WASI_SDK_PREFIX}/bin/clang++${WASI_HOST_EXE_SUFFIX})
-set(CMAKE_AR ${WASI_SDK_PREFIX}/bin/llvm-ar${WASI_HOST_EXE_SUFFIX})
-set(CMAKE_RANLIB ${WASI_SDK_PREFIX}/bin/llvm-ranlib${WASI_HOST_EXE_SUFFIX})
-set(CMAKE_C_COMPILER_TARGET ${triple})
-set(CMAKE_CXX_COMPILER_TARGET ${triple})
-
-# Don't look in the sysroot for executables to run during the build
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-# Only look in the sysroot (not in the host paths) for the rest
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)

Copied: wasi-libc++/repos/community-any/wasi-toolchain.cmake (from rev 1129249, wasi-libc++/trunk/wasi-toolchain.cmake)
===================================================================
--- wasi-toolchain.cmake	                        (rev 0)
+++ wasi-toolchain.cmake	2022-02-08 15:28:35 UTC (rev 1129250)
@@ -0,0 +1,29 @@
+# Cmake toolchain description file for the Makefile
+
+# This is arbitrary, AFAIK, for now.
+cmake_minimum_required(VERSION 3.4.0)
+
+set(CMAKE_SYSTEM_NAME WASI)
+set(CMAKE_SYSTEM_VERSION 1)
+set(CMAKE_SYSTEM_PROCESSOR wasm32)
+set(triple wasm32-wasi)
+
+if(WIN32)
+  set(WASI_HOST_EXE_SUFFIX ".exe")
+else()
+  set(WASI_HOST_EXE_SUFFIX "")
+endif()
+
+set(CMAKE_C_COMPILER ${WASI_SDK_PREFIX}/bin/clang${WASI_HOST_EXE_SUFFIX})
+set(CMAKE_CXX_COMPILER ${WASI_SDK_PREFIX}/bin/clang++${WASI_HOST_EXE_SUFFIX})
+set(CMAKE_AR ${WASI_SDK_PREFIX}/bin/llvm-ar${WASI_HOST_EXE_SUFFIX})
+set(CMAKE_RANLIB ${WASI_SDK_PREFIX}/bin/llvm-ranlib${WASI_HOST_EXE_SUFFIX})
+set(CMAKE_C_COMPILER_TARGET ${triple})
+set(CMAKE_CXX_COMPILER_TARGET ${triple})
+
+# Don't look in the sysroot for executables to run during the build
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+# Only look in the sysroot (not in the host paths) for the rest
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)



More information about the arch-commits mailing list