--- a/texlive.SlackBuild	2021-10-13 22:03:23.548288963 +0000
+++ b/texlive.SlackBuild	2021-10-13 22:03:40.164737140 +0000
@@ -60,6 +60,12 @@
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "riscv64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
@@ -68,6 +74,8 @@
   LIBDIRSUFFIX=""
 fi
 
+[[ $ARCH == "riscv64" ]] && OPTIONS="--disable-luajittex --disable-luajithbtex --disable-mfluajit"
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
@@ -79,6 +87,8 @@
 
 # fixes from stable branch
 cat $CWD/patches/fixes-210420.patch | patch -p1 --verbose || exit 1
+xzcat $CWD/broke-mendexk-tests-arm-aarch64.patch.xz | patch -p1 --verbose || exit 1
+xzcat $CWD/broke-upmendexk-tests-arm-aarch64.patch.xz | patch -p1 --verbose || exit 1
 
 mkdir build
 cd build
@@ -121,6 +131,7 @@
     --with-system-ncurses \
     --with-system-harfbuzz \
     --disable-linked-scripts \
+    $OPTIONS \
     --build=$ARCH-slackware-linux || exit 1
 
   make $NUMJOBS || make || exit 1