Fri Jun 21 00:44:39 UTC 2024HEAD20240621004439master

a/mcelog-200-x86_64-1.txz:  Upgraded.
a/shadow-4.16.0-x86_64-1.txz:  Upgraded.
d/llvm-18.1.8-x86_64-1.txz:  Upgraded.
  Build from git rather than individual tarballs (this simplifies things).
  Build additional projects: bolt, flang, mlir.
l/gmime-3.2.15-x86_64-1.txz:  Upgraded.
l/gst-plugins-bad-free-1.24.5-x86_64-1.txz:  Upgraded.
l/gst-plugins-base-1.24.5-x86_64-1.txz:  Upgraded.
l/gst-plugins-good-1.24.5-x86_64-1.txz:  Upgraded.
l/gst-plugins-libav-1.24.5-x86_64-1.txz:  Upgraded.
l/gstreamer-1.24.5-x86_64-1.txz:  Upgraded.
l/libclc-18.1.8-x86_64-1.txz:  Upgraded.
l/mujs-1.3.5-x86_64-1.txz:  Upgraded.
l/nodejs-20.15.0-x86_64-1.txz:  Upgraded.
l/python-importlib_metadata-7.2.0-x86_64-1.txz:  Upgraded.
l/qt6-6.7.2_20240610_3f005f1e-x86_64-1.txz:  Upgraded.
n/openvpn-2.6.11-x86_64-1.txz:  Upgraded.
x/libva-2.22.0-x86_64-1.txz:  Upgraded.
x/libva-utils-2.22.0-x86_64-1.txz:  Upgraded.

5 files changed, 176 insertions, 171 deletions

diff --git a/source/d/llvm/libclc.SlackBuild b/source/d/llvm/libclc.SlackBuild
new file mode 100755
index 000000000..d9a3e7e40
--- /dev/null
+++ b/source/d/llvm/libclc.SlackBuild
@@ -0,0 +1,122 @@
+#!/bin/bash
+
+# Slackware build script for libclc
+
+# Copyright 2016  Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2017, 2018, 2021, 2024  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=libclc
+VERSION=${VERSION:-$(echo llvmorg-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
+# Automatically determine the architecture we're building on:
+MARCH=$( uname -m )
+if [ -z "$ARCH" ]; then
+  case "$MARCH" in
+    i?86)    export ARCH=i586 ;;
+    armv7hl) export ARCH=$MARCH ;;
+    arm*)    export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+    *)       export ARCH=$MARCH ;;
+  esac
+fi
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+BUILDDIR=${TMP}/libclc-build-${VERSION}
+
+rm -rf $PKG $BUILDDIR
+mkdir -p $TMP $PKG $BUILDDIR
+cd $BUILDDIR
+
+# Add a fake configure script so the cleanup script used here at Slackware
+# knows to delete this stuff later. Other folks can just ignore this... it
+# doesn't have any other purpose.
+touch configure
+chmod 755 configure
+
+echo "Extracting $CWD/llvmorg-$VERSION.tar.?z..."
+tar xf $CWD/llvmorg-$VERSION.tar.?z llvm-project-llvmorg-$VERSION/libclc || tar xf $CWD/llvmorg-$VERSION.tar.?z llvmorg-$VERSION/libclc || exit 1
+cd llvm-project-llvmorg-$VERSION/libclc || cd llvmorg-$VERSION/libclc || exit 1
+
+chown -R root:root .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \+ -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \+
+
+# Configure, build, and install:
+mkdir cmake-build
+cd cmake-build
+  cmake \
+    -DCMAKE_C_FLAGS="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX="$LIBDIRSUFFIX" \
+    -DDOC_INSTALL_DIR="doc" \
+    -DMAN_INSTALL_DIR=/usr/man \
+    .. || exit 1
+  make $NUMJOBS || make || exit 1
+  make install DESTDIR=$PKG || exit 1
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a *.{txt,md,TXT,rst} $PKG/usr/doc/$PKGNAM-$VERSION
+rm -f $PKG/usr/doc/$PKGNAM-$VERSION/CMakeLists.txt
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/d/llvm/lldb.32-bit.link.libatomic.diff b/source/d/llvm/lldb.32-bit.link.libatomic.diff
deleted file mode 100644
index 234bcdc72..000000000
--- a/source/d/llvm/lldb.32-bit.link.libatomic.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./tools/lldb/source/Utility/CMakeLists.txt.orig	2022-06-22 11:46:24.000000000 -0500
-+++ ./tools/lldb/source/Utility/CMakeLists.txt	2022-06-27 22:33:56.715179825 -0500
-@@ -19,9 +19,9 @@
-   list(APPEND LLDB_SYSTEM_LIBS ws2_32 rpcrt4)
- endif ()
- 
--if (NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB )
-+#if (NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB )
-     list(APPEND LLDB_SYSTEM_LIBS atomic)
--endif()
-+#endif()
- 
- add_lldb_library(lldbUtility
-   ArchSpec.cpp
diff --git a/source/d/llvm/llvm.SlackBuild b/source/d/llvm/llvm.SlackBuild
index aab67ce71..dc9c1484e 100755
--- a/source/d/llvm/llvm.SlackBuild
+++ b/source/d/llvm/llvm.SlackBuild
@@ -26,21 +26,9 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=llvm
-VERSION=${VERSION:-$(echo llvm-*.tar.xz | rev | cut -f 4- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo llvmorg-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
-# For the two options below, either set both to OFF or *only one* to ON:
-
-# Build using -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON -DCLANG_LINK_CLANG_DYLIB=ON:
-# This is the upstream recommended way to build LLVM with shared libraries and
-# seems to be the way to go these days.
-LLVM_BUILD_LLVM_DYLIB=${LLVM_BUILD_LLVM_DYLIB:=ON}
-
-# Build using -DBUILD_SHARED_LIBS=ON.
-# We used this for years here to get a smaller LLVM package, but it no longer
-# works. Feel free to try it, but expect breakage.
-BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:=OFF}
-
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
 if [ -z "$ARCH" ]; then
@@ -51,6 +39,17 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+# Select projects to build:
+if [ "$ARCH" = "i586" -o "$ARCH" = "i686" ]; then
+  # bolt and flang are not available on 32-bit
+  LLVM_ENABLE_PROJECTS=${LLVM_ENABLE_PROJECTS:-"clang;clang-tools-extra;compiler-rt;lld;lldb;llvm;mlir;openmp;polly"}
+else
+  LLVM_ENABLE_PROJECTS=${LLVM_ENABLE_PROJECTS:-"bolt;clang;clang-tools-extra;compiler-rt;flang;lld;lldb;llvm;mlir;openmp;polly"}
+fi
+
+# Select runtimes to build:
+LLVM_ENABLE_RUNTIMES=${LLVM_ENABLE_RUNTIMES:-"libcxx;libcxxabi"}
+
 # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
 # the name of the created package would be, and then exit. This information
 # could be useful to other scripts.
@@ -81,19 +80,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# Building clangd will be determined automatically unless BUILD_CLANG is
-# preset to YES or NO:
-if [ -z $BUILD_CLANGD ]; then
-  if [ "$ARCH" = "i586" -o "$ARCH" = "i686" ]; then
-    BUILD_CLANGD=NO
-  else
-    BUILD_CLANGD=YES
-  fi
-fi
-if [ "$BUILD_CLANGD" = "NO" ]; then
-  CLANGD="-DCLANG_ENABLE_CLANGD=OFF"
-fi
-
 # Python3 short version:
 PY3=$(python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' | cut -f 2 -d n | cut -f 1 -d /)
 
@@ -107,83 +93,12 @@ cd $BUILDDIR
 touch configure
 chmod 755 configure
 
-# Extract and rename some support files:
-echo "Extracting $CWD/cmake-$VERSION.src.tar.xz..."
-tar xf $CWD/cmake-$VERSION.src.tar.xz || exit 1
-mv cmake-$VERSION.src cmake
-echo "Extracting $CWD/third-party-$VERSION.src.tar.xz..."
-tar xf $CWD/third-party-$VERSION.src.tar.xz || exit 1
-mv third-party-$VERSION.src third-party
-echo "Extracting $CWD/runtimes-$VERSION.src.tar.xz..."
-tar xf $CWD/runtimes-$VERSION.src.tar.xz || exit 1
-mv runtimes-${VERSION}.src/cmake/Modules/* cmake/Modules || exit 1
-rm -r runtimes-${VERSION}.src
-
-rm -rf $PKGNAM-${VERSION}.src $PKGNAM-${VERSION}
-echo "Extracting $CWD/$PKGNAM-$VERSION.src.tar.xz..."
-tar xf $CWD/$PKGNAM-$VERSION.src.tar.xz || exit 1
-
-cd $PKGNAM-${VERSION}.src/tools || cd $PKGNAM-${VERSION}/tools || exit 1
-  echo "Extracting $CWD/clang-$VERSION.src.tar.xz..."
-  tar xf $CWD/clang-$VERSION.src.tar.xz || exit 1
-  mv clang-${VERSION} clang 2>/dev/null || mv clang-${VERSION}.src clang || exit 1
-  #echo "Extracting $CWD/flang-$VERSION.src.tar.xz..."
-  #tar xf $CWD/flang-$VERSION.src.tar.xz || exit 1
-  #mv flang-${VERSION} flang 2>/dev/null || mv flang-${VERSION}.src flang || exit 1
-  echo "Extracting $CWD/lldb-$VERSION.src.tar.xz..."
-  tar xf $CWD/lldb-$VERSION.src.tar.xz || exit 1
-  mv lldb-${VERSION} lldb 2>/dev/null || mv lldb-${VERSION}.src lldb || exit 1
-  echo "Extracting $CWD/lld-$VERSION.src.tar.xz..."
-  tar xf $CWD/lld-$VERSION.src.tar.xz || exit 1
-  mv lld-${VERSION} lld 2>/dev/null || mv lld-${VERSION}.src lld || exit 1
-cd ../
-
-cd tools/clang/tools || exit 1
-  echo "Extracting $CWD/clang-tools-extra-$VERSION.src.tar.xz..."
-  tar xf $CWD/clang-tools-extra-$VERSION.src.tar.xz || exit 1
-  mv clang-tools-extra-${VERSION} extra 2>/dev/null \
-    || mv clang-tools-extra-${VERSION}.src extra || exit 1
-cd ../../../
-
-cd projects || exit 1
-  echo "Extracting $CWD/compiler-rt-$VERSION.src.tar.xz..."
-  tar xf $CWD/compiler-rt-$VERSION.src.tar.xz || exit 1
-  mv compiler-rt-${VERSION} compiler-rt 2>/dev/null || mv compiler-rt-${VERSION}.src compiler-rt || exit 1
-  echo "Extracting $CWD/openmp-$VERSION.src.tar.xz..."
-  tar xf $CWD/openmp-$VERSION.src.tar.xz || exit 1
-  mv openmp-${VERSION} openmp 2>/dev/null || mv openmp-${VERSION}.src openmp || exit 1
-  echo "Extracting $CWD/libcxx-${VERSION}.src.tar.xz..."
-  tar xf $CWD/libcxx-${VERSION}.src.tar.xz || exit 1
-  mv libcxx-${VERSION} libcxx 2>/dev/null || mv libcxx-${VERSION}.src libcxx || exit 1
-  echo "Extracting $CWD/libcxxabi-${VERSION}.src.tar.xz..."
-  tar xf $CWD/libcxxabi-${VERSION}.src.tar.xz || exit 1
-  mv libcxxabi-${VERSION} libcxxabi 2>/dev/null || mv libcxxabi-${VERSION}.src libcxxabi || exit 1
-  echo "Extracting $CWD/polly-$VERSION.src.tar.xz..."
-  tar xf $CWD/polly-$VERSION.src.tar.xz || exit 1
-  mv polly-${VERSION} polly 2>/dev/null || mv polly-${VERSION}.src polly || exit 1
-  # We just need a header file from this...
-  echo "Extracting $CWD/libunwind-${VERSION}.src.tar.xz..."
-  tar xf $CWD/libunwind-${VERSION}.src.tar.xz || exit 1
-  mv libunwind-${VERSION}.src libunwind || mv libunwind-${VERSION} libunwind || exit 1
-cd ../
+echo "Extracting $CWD/llvmorg-$VERSION.tar.?z..."
+tar xf $CWD/llvmorg-$VERSION.tar.?z || exit 1
+cd llvm-project-llvmorg-$VERSION || cd llvmorg-$VERSION || exit 1
 
 # Support GCC built for i586-slackware-linux:
-zcat $CWD/clang.toolchains.i586.triple.diff.gz | patch -p1 --verbose || exit 1
-
-# We require libatomic on 32-bit platforms:
-if [ -f ./tools/lldb/source/Utility/CMakeLists.txt ]; then
-  if [ "$ARCH" = "i586" -o "$ARCH" = "i686" ]; then
-    zcat $CWD/lldb.32-bit.link.libatomic.diff.gz | patch -p1 --verbose || exit 1
-  fi
-fi
-
-# These hackish links seem to be required...
-cd ..
-ln -sf */runtimes .
-cd -
-cd projects
-ln -sf ../../cmake .
-cd -
+zcat $CWD/clang.toolchains.i586.triple.diff.gz | patch -p2 --verbose || exit 1
 
 chown -R root:root .
 find . \
@@ -192,22 +107,8 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-# Collect shared library options. If both of the configurable options are set
-# to ON, the last one we check will be the one we use.
-if [ "$BUILD_SHARED_LIBS" = "ON" ]; then
-  SHARED_LIBRARY_OPTIONS="-DBUILD_SHARED_LIBS=ON"
-fi
-if [ "$LLVM_BUILD_LLVM_DYLIB" = "ON" ]; then
-  SHARED_LIBRARY_OPTIONS="-DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON -DCLANG_LINK_CLANG_DYLIB=ON"
-fi
-
 mkdir build
 cd build
-  mkdir include
-  # Copy this LLVM libunwind header or it won't be found:
-  cp -a ../projects/libunwind/include/mach-o include
-  # Nuke LLVM libunwind as it conflicts with the one already on the system:
-  rm -r ../projects/libunwind
   cmake -GNinja \
     -DCMAKE_C_COMPILER="clang" \
     -DCMAKE_CXX_COMPILER="clang++" \
@@ -215,11 +116,13 @@ cd build
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLLVM_LIBDIR_SUFFIX=${LIBDIRSUFFIX} \
-    -DLIBCXX_LIBDIR_SUFFIX=${LIBDIRSUFFIX} \
-    -DLIBCXXABI_LIBDIR_SUFFIX=${LIBDIRSUFFIX} \
     -DCMAKE_BUILD_TYPE=Release \
-    $SHARED_LIBRARY_OPTIONS \
+    -DLLVM_BUILD_LLVM_DYLIB=ON \
+    -DLLVM_LINK_LLVM_DYLIB=ON \
+    -DCLANG_LINK_CLANG_DYLIB=ON \
     -DLLVM_USE_LINKER=lld \
+    -DLLVM_ENABLE_PROJECTS="$LLVM_ENABLE_PROJECTS" \
+    -DLLVM_ENABLE_RUNTIMES="$LLVM_ENABLE_RUNTIMES" \
     -DLLVM_ENABLE_RTTI=ON \
     -DLLVM_ENABLE_FFI=ON \
     -DLLVM_ENABLE_ZLIB=ON \
@@ -230,14 +133,14 @@ cd build
     -DCLANG_RESOURCE_DIR="../lib${LIBDIRSUFFIX}/clang/$(echo $VERSION | cut -f 1 -d .)" \
     -DLLVM_TARGETS_TO_BUILD="host;AMDGPU;BPF" \
     -DLLVM_INCLUDE_BENCHMARKS=OFF \
-    -DLIBCXX_INCLUDE_BENCHMARKS=OFF \
     -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \
     -DCLANG_DEFAULT_PIE_ON_LINUX=ON \
+    -DLIBCXX_LIBDIR_SUFFIX=${LIBDIRSUFFIX} \
+    -DLIBCXXABI_LIBDIR_SUFFIX=${LIBDIRSUFFIX} \
+    -DLIBCXX_INCLUDE_BENCHMARKS=OFF \
     -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=ON \
     -DLIBCXXABI_USE_LLVM_UNWINDER=OFF \
-    $CLANGD \
-    ..  || exit 1
-
+    ../llvm  || exit 1
   "${NINJA:=ninja}" $NUMJOBS || exit 1
   DESTDIR=$PKG "$NINJA" install || exit 1
 cd ..
@@ -267,7 +170,7 @@ rm -f $PKG/usr/lib$LIBDIRSUFFIX/libgomp.so
 # Install Python bindings:
 for pyver in ${PY3}; do
   mkdir -p "$PKG/usr/lib$LIBDIRSUFFIX/python$pyver/site-packages"
-  cp -a tools/clang/bindings/python/clang "$PKG/usr/lib$LIBDIRSUFFIX/python$pyver/site-packages/"
+  cp -a clang/bindings/python/clang "$PKG/usr/lib$LIBDIRSUFFIX/python$pyver/site-packages/"
 done
 
 # Remove bundled python-six:
@@ -302,22 +205,14 @@ for i in $( find $PKG/usr/man -type l ) ; do
   rm $i
 done
 
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/{clang,lldb,clang-tools-extra,compiler-rt,openmp,polly}
-cp -a CREDITS* LICENSE* README* $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a tools/clang/{INSTALL,LICENSE,NOTES,README}* \
-  $PKG/usr/doc/$PKGNAM-$VERSION/clang
-cp -a tools/lldb/{CODE_OWNERS,INSTALL,LICENSE}* \
-  $PKG/usr/doc/$PKGNAM-$VERSION/lldb
-cp -a tools/clang/tools/extra/{CODE_OWNERS,LICENSE,README}* \
-  $PKG/usr/doc/$PKGNAM-$VERSION/clang-tools-extra
-cp -a projects/compiler-rt/{CODE_OWNERS,CREDITS,LICENSE,README}* \
-  $PKG/usr/doc/$PKGNAM-$VERSION/compiler-rt
-cp -a projects/openmp/{CREDITS,LICENSE}* \
-  $PKG/usr/doc/$PKGNAM-$VERSION/openmp
-cp -a projects/polly/{CREDITS,LICENSE,README}* \
-  $PKG/usr/doc/$PKGNAM-$VERSION/polly
-mv $PKG/usr/docs/llvm/* $PKG/usr/doc/$PKGNAM-$VERSION
-rm -rf $PKG/usr/docs
+# Just copy anything top or next level that looks like it might be docs.
+# Maybe we'll include it someday. ;-)
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a *.{txt,md,TXT,rst} $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a --parents */*.{txt,md,TXT,rst} $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a --parents */README* $PKG/usr/doc/$PKGNAM-$VERSION
+find $PKG/usr/doc/$PKGNAM-$VERSION -name CMakeLists.txt -exec rm -f "{}" \;
+rmdir $PKG/usr/doc/$PKGNAM-$VERSION/* 2> /dev/null
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/d/llvm/llvm.url b/source/d/llvm/llvm.url
index ddc576f2d..0ad8ed9f4 100644
--- a/source/d/llvm/llvm.url
+++ b/source/d/llvm/llvm.url
@@ -1,18 +1 @@
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/llvm-18.1.7.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/clang-18.1.7.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/clang-tools-extra-18.1.7.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/compiler-rt-18.1.7.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/flang-18.1.7.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/lldb-18.1.7.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/openmp-18.1.7.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/polly-18.1.7.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/libcxx-18.1.7.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/libcxxabi-18.1.7.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/lld-18.1.7.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/libunwind-18.1.7.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/cmake-18.1.7.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/third-party-18.1.7.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.7/runtimes-18.1.7.src.tar.xz
-#
-# Also look for spirv-llvm-translator and libclc!
-#
+https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-18.1.8.tar.gz
diff --git a/source/d/llvm/slack-desc.libclc b/source/d/llvm/slack-desc.libclc
new file mode 100644
index 000000000..12a032243
--- /dev/null
+++ b/source/d/llvm/slack-desc.libclc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+libclc: libclc (OpenCL 1.1 libraries)
+libclc:
+libclc: libclc is an open source, BSD/MIT dual licensed implementation of the
+libclc: library requirements of the OpenCL C programming language, as
+libclc: specified by the OpenCL 1.1 Specification.
+libclc:
+libclc: Homepage: http://libclc.llvm.org/
+libclc:
+libclc:
+libclc:
+libclc: