3 files changed, 16 insertions, 8 deletions
diff --git a/source/d/llvm/llvm.SlackBuild b/source/d/llvm/llvm.SlackBuild
index 81a18569..4c7f869b 100755
--- a/source/d/llvm/llvm.SlackBuild
+++ b/source/d/llvm/llvm.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=llvm
 VERSION=${VERSION:-$(echo llvm-*.tar.xz | rev | cut -f 4- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -153,6 +153,7 @@ cd build
     -DLLVM_BINUTILS_INCDIR=/usr/include \
     -DCLANG_RESOURCE_DIR="../lib${LIBDIRSUFFIX}/clang/${VERSION}" \
     -DLLVM_TARGETS_TO_BUILD="host;AMDGPU;BPF" \
+    -DLLDB_USE_SYSTEM_SIX=1 \
     $CLANGD \
     ..  || exit 1
 
@@ -166,25 +167,31 @@ cd ..
   ln -sf clang++ $ARCH-slackware-linux-clang++
 )
 
-# install clang-static-analyzer
+# Install clang-static-analyzer:
 for i in ccc c++; do
   ln -s /usr/libexec/$i-analyzer \
     $PKG/usr/bin/$i-analyzer || exit 1
 done
 
-# Remove symlink to libgomp, which is already provided by gcc
+# Ensure lit-cpuid is installed:
+if [ ! -r $PKG/usr/bin/lit-cpuid ]; then
+  cp -a build/bin/lit-cpuid $PKG/usr/bin/lit-cpuid
+  chown root:root $PKG/usr/bin/lit-cpuid
+  chmod 755 $PKG/usr/bin/lit-cpuid
+fi
+# Remove symlink to libgomp, which is already provided by gcc:
 rm -f $PKG/usr/lib$LIBDIRSUFFIX/libgomp.so
 
-# Install Python bindings
+# Install Python bindings:
 for pyver in ${PY2} ${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/"
 done
 
-# Remove bundled python-six
+# Remove bundled python-six:
 rm -f "$PKG/usr/lib$LIBDIRSUFFIX/python${PY2}/site-packages/six.py"
 
-# Compile Python scripts
+# Compile Python scripts:
 python -m compileall "$PKG/usr/lib$LIBDIRSUFFIX/python${PY2}/site-packages/clang"
 python -O -m compileall "$PKG/usr/lib$LIBDIRSUFFIX/python${PY2}/site-packages/clang"
 python3 -m compileall "$PKG/usr/lib$LIBDIRSUFFIX/python${PY3}/site-packages/clang"
diff --git a/source/n/nfs-utils/nfs-utils.SlackBuild b/source/n/nfs-utils/nfs-utils.SlackBuild
index 3a8b4450..77574085 100755
--- a/source/n/nfs-utils/nfs-utils.SlackBuild
+++ b/source/n/nfs-utils/nfs-utils.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=nfs-utils
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -108,6 +108,7 @@ CFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --with-statedir=/var/lib/nfs \
+  --with-pluginpath=/usr/lib${LIBDIRSUFFIX}/libnfsidmap \
   --disable-static \
   --enable-mountconfig \
   --enable-nfsv4=yes \
diff --git a/source/x/x11/build/xorg-server b/source/x/x11/build/xorg-server
index 0cfbf088..d00491fd 100644
--- a/source/x/x11/build/xorg-server
+++ b/source/x/x11/build/xorg-server
@@ -1 +1 @@
-2
+1