From 9554174f21c5e8ec285ef6edfca59d30147d58db Mon Sep 17 00:00:00 2001 From: Ella-0 <23418164+Ella-0@users.noreply.github.com> Date: Sun, 17 Jan 2021 14:58:45 +0000 Subject: [PATCH] Updated LLVM --- pkgs/libcxx/build.sh | 65 -------------------------------------------- pkgs/llvm/build.sh | 32 ++++------------------ 2 files changed, 5 insertions(+), 92 deletions(-) delete mode 100644 pkgs/libcxx/build.sh diff --git a/pkgs/libcxx/build.sh b/pkgs/libcxx/build.sh deleted file mode 100644 index 122bbe4..0000000 --- a/pkgs/libcxx/build.sh +++ /dev/null @@ -1,65 +0,0 @@ -pkgver=11.0.0 -pkgname=libcxx -bad="" -ext="dev" - -fetch() { - curl -L "https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.0/llvm-project-11.0.0.tar.xz" -o $pkgname-$pkgver.tar.gz - tar -xf $pkgname-$pkgver.tar.gz - mv llvm-project-$pkgver $pkgname-$pkgver -} - -build() { - cd $pkgname-$pkgver - mkdir -p build - cd build - cmake -G Ninja \ - -DCMAKE_C_COMPILER=clang \ - -DCMAKE_CXX_COMPILER=clang++ \ - -DCMAKE_INSTALL_PREFIX=/ \ - -DCMAKE_BUILD_TYPE=Release \ - -DLLVM_ENABLE_LLD=ON \ - -DLLVM_ENABLE_PROJECTS="libunwind;libcxx;libcxxabi" \ - -DLLVM_TARGETS_TO_BUILD=X86 \ - -DLIBCXX_ENABLE_FILESYSTEM=ON \ - -DLIBCXX_USE_COMPILER_RT=ON \ - -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON \ - -DLIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY=ON \ - -DLIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY=ON \ - -DLIBCXXABI_ENABLE_ASSERTIONS=ON \ - -DLIBCXXABI_USE_COMPILER_RT=ON \ - -DLIBCXXABI_USE_LLVM_UNWINDER=ON \ - -DLIBCXXABI_ENABLE_STATIC_UNWINDER=ON \ - -DLIBCXXABI_STATICALLY_LINK_UNWINDER_IN_SHARED_LIBRARY=YES \ - -DLIBCXXABI_ENABLE_SHARED=ON \ - -DLIBCXXABI_ENABLE_STATIC=ON \ - -DLIBUNWIND_ENABLE_SHARED=ON \ - -DLIBUNWIND_ENABLE_STATIC=ON \ - -DLIBUNWIND_USE_COMPILER_RT=ON \ - ../llvm -# -DLIBCXX_HAS_MUSL_LIBC=ON \ - samu cxx unwind -} - -package() { - cd $pkgname-$pkgver - cd build - DESTDIR=$pkgdir samu install-cxx install-unwind - rm $pkgdir/lib/*.a - rm -r $pkgdir/include -} - -package_dev() { - cd $pkgname-$pkgver - cd build - DESTDIR=$pkgdir samu install-cxx install-cxx-headers install-unwind - rm $pkgdir/lib/*.so.* - rm $pkgdir/lib/*.so -} - -license() { - cd $pkgname-$pkgver - cat libcxx/LICENSE.TXT - cat libcxxabi/LICENSE.TXT - cat libunwind/LICENSE.TXT -} diff --git a/pkgs/llvm/build.sh b/pkgs/llvm/build.sh index cf1d844..00d752f 100644 --- a/pkgs/llvm/build.sh +++ b/pkgs/llvm/build.sh @@ -1,7 +1,7 @@ pkgver=11.0.0 pkgname=llvm bad="" -ext="libunwind:libunwind-dev:libcxx:libcxx-dev" +ext="dev" fetch() { curl -L "https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.0/llvm-project-11.0.0.tar.xz" -o $pkgname-$pkgver.tar.gz @@ -96,36 +96,14 @@ package() { cd $pkgname-$pkgver cd build DESTDIR=$pkgdir samu install - rm $pkgdir/lib/*.a - rm $pkgdir/lib/libunwind.* - rm -r $pkgdir/lib/cmake + ln -sr $pkgdir/usr/bin/clang $pkgdir/usr/bin/cc + ln -sr $pkgdir/usr/bin/clang++ $pkgdir/usr/bin/c++ } -package_libunwind() { - cd $pkgname-$pkgver - cd build - DESTDIR=$pkgdir samu install-unwind - rm $pkgdir/lib/*.a +package_dev() { + echo "No... Shut" } -package_libunwind_dev() { - cd $pkgname-$pkgver - cd build - DESTDIR=$pkgdir samu install-unwind - rm $pkgdir/lib/*.so -} - -package_libcxx() { - cd $pkgname-$pkgver - cd build - DESTDIR=$pkgdir samu install-libcxx -} - -package_libcxx_dev() { - cd $pkgname-$pkgver - cd build - DESTDIR=$pkgdir samu install-libcxx -} license() { cd $pkgname-$pkgver cat */LICENSE.TXT