Merge pull request #1543 from hadfl/texlive

texlive: update to 20240312
omniosorg · Nov 12, 2024 · 20eb755 · 20eb755
2 parents f55c6f8 + d6a9473
commit 20eb755
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/build/texlive/build.sh b/build/texlive/build.sh
@@ -18,15 +18,14 @@
 . ../../lib/build.sh
 
 PROG=texlive
-VER=20230313
+VER=20240312
 PKG=ooce/application/texlive
 SUMMARY="TeX Live"
 DESC="LaTeX distribution"
 
-# does not yet build with gcc 14
-((GCCVER > 13)) && set_gccver 13
-
 set_arch 64
+set_clangver
+set_standard XPG6
 
 OPREFIX=$PREFIX
 PREFIX+=/$PROG
@@ -72,7 +71,7 @@ pre_configure() {
     # config.status is broken.
     # We already export SHELL=bash in config.sh but that doesn't seem
     # to be enough.
-    CONFIGURE_CMD="/usr/bin/bash $TMPDIR/$PROG-$VER-source/configure"
+    CONFIGURE_CMD="$SHELL $TMPDIR/$PROG-$VER-source/configure"
 }
 
 dl_dist() {
@@ -85,15 +84,15 @@ install_dist() {
     dst="$DESTDIR$PREFIX/share"
     # manpages get installed from the source package into $PREFIX/share/man
     # already
-    rm -rf $TMPDIR/$PROG-$VER-texmf/texmf-dist/doc/man
-    logcmd mkdir -p $dst
+    logcmd $RM -rf $TMPDIR/$PROG-$VER-texmf/texmf-dist/doc/man
+    logcmd $MKDIR -p $dst
     logmsg "--- Copying texmf"
-    logcmd rsync -a $TMPDIR/$PROG-$VER-texmf/texmf-dist $dst/ \
+    logcmd $RSYNC -a $TMPDIR/$PROG-$VER-texmf/texmf-dist $dst/ \
         || logerr "rsync texmf"
     logmsg "--- Copying extra"
-    logcmd rsync -a $TMPDIR/$PROG-$VER-extra/tlpkg $dst/ \
+    logcmd $RSYNC -a $TMPDIR/$PROG-$VER-extra/tlpkg $dst/ \
         || logerr "rsync extra"
-    logcmd cp $TMPDIR/$PROG-$VER-extra/LICENSE.TL \
+    logcmd $CP $TMPDIR/$PROG-$VER-extra/LICENSE.TL \
         $TMPDIR/$EXTRACTED_SRC/LICENSE.TL \
         || logerr "copy LICENSE.TL"
 }
@@ -115,7 +114,7 @@ config_tex() {
 }
 
 CFLAGS+=" -I$OPREFIX/include"
-LDFLAGS[amd64]+=" -R$OPREFIX/lib/amd64"
+LDFLAGS[amd64]+=" -Wl,-R$OPREFIX/${LIBDIRS[amd64]}"
 # /usr/lib/amd64/pkgconfig for mpfr
 subsume_arch amd64 PKG_CONFIG_PATH
 addpath PKG_CONFIG_PATH /usr/lib/amd64/pkgconfig

diff --git a/doc/packages.md b/doc/packages.md
@@ -23,7 +23,7 @@
 | ooce/application/php-83	| 8.3.13	| https://www.php.net/downloads.php | [omniosorg](https://github.com/omniosorg)
 | ooce/application/php-XX/imagick	| 3.7.0	| https://github.com/Imagick/imagick/tags | [omniosorg](https://github.com/omniosorg)
 | ooce/application/rustdesk-server | 1.1.12	| https://github.com/rustdesk/rustdesk-server/releases | [omniosorg](https://github.com/omniosorg)
-| ooce/application/texlive	| 20230313	| https://pi.kwarc.info/historic/systems/texlive/2023/ | [omniosorg](https://github.com/omniosorg)
+| ooce/application/texlive	| 20240312	| https://pi.kwarc.info/historic/systems/texlive/2024/ | [omniosorg](https://github.com/omniosorg)
 | ooce/application/tidy		| 5.8.0		| https://github.com/htacg/tidy-html5/releases | [omniosorg](https://github.com/omniosorg)
 | ooce/application/tig 		| 2.5.10	| https://github.com/jonas/tig/releases | [omniosorg](https://github.com/omniosorg)
 | ooce/application/vagrant	| 2.2.19	| https://github.com/hashicorp/vagrant/tags | [omniosorg](https://github.com/omniosorg)