From 892914a2770808252b0c15d099f1dd537aff3645 Mon Sep 17 00:00:00 2001 From: Robert Alessi Date: Mon, 10 Feb 2025 10:50:17 +0100 Subject: 2025-pretest --- LICENSE | 2 +- README.md | 50 ++++++++++++++++++-------- makefile | 2 +- patches/patch-source-asymptote-fileio_cc | 18 ++++++++++ patches/patch-source-clisp-clispver_lispbibl_d | 18 ++++++++++ tl-build.sh | 5 ++- variables.conf | 2 +- 7 files changed, 78 insertions(+), 19 deletions(-) create mode 100644 patches/patch-source-asymptote-fileio_cc create mode 100644 patches/patch-source-clisp-clispver_lispbibl_d diff --git a/LICENSE b/LICENSE index ed101cd..5ee44cf 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ Unless otherwise stated, the following terms apply to all files in this repository:— -Copyright (c) 2024 Robert Alessi +Copyright (c) 2024, 2025 Robert Alessi Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above diff --git a/README.md b/README.md index 9e18d6e..886106f 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ TeX Live for *Open*BSD Contents -------- -- [Current Release](#2024-release) +- [Current Release](#2025-release) - [Running TeX Live in OpenBSD](#running-tex-live-in-openbsd) - [TeX Live for OpenBSD at Utah](#tex-live-for-openbsd-at-utah) - [Installing TeX Live on OpenBSD With Ready-to-Use Binaries](#installing-tex-live-on-openbsd-with-ready-to-use-binaries) @@ -12,21 +12,23 @@ Contents - [Building the Sources](#building-the-sources) - [Acknowledgements](#acknowledgements) -2024 Release ------------- +2025 Release (pretest) +---------------------- -[Updated August 14, 2024] TeX Live for OpenBSD is meant for the [2024 +[Updated February 10, 2025] TeX Live for OpenBSD is meant for the [2025 release of TeX Live](https://tug.org/texlive), and will always run on both -stable and -current versions of OpenBSD. -The TeX Live 2024 binaries are available for the following versions of -OpenBSD: +The TeX Live 2025 pretest binaries are available for the following +versions of OpenBSD: -- 7.4 (frozen as of April 6, 2024) -- 7.5 (frozen as of September 4, 2024) - 7.6 - 7.6-current +Archives +-------- +- 2024 ([link](https://www.ekdosis.org/texlive/2024)) + Running TeX Live in OpenBSD --------------------------- @@ -69,10 +71,7 @@ be found here: . From this url, the binaries for OpenBSD are located in the [`bin/`](https://ftp.math.utah.edu/pub/texlive-utah/bin) -subdirectory. Look for `amd64-openbsd*.tar.xz`. the build for 7.4 was -done with the `gcc-11` compilers. The one for 7.5 is done with the -`gcc-8.4.0` compilers which are widely used to build most OpenBSD -ports. +subdirectory. Look for `amd64-openbsd*.tar.xz`. The binaries available here are made with `clang`, which is the base system compiler. @@ -91,7 +90,13 @@ Please read first the reference page on this matter: 2. Acquire `install-tl-unx.tar.gz` from CTAN as described [on this page](https://tug.org/texlive/acquire-netinstall.html). - - do: + +> [NOTE!] +> During the so-called “pretest” phase, that is between February 8, +> and March 8 2025, the TeX Live installer must be retrieved from [one +> of these hosts](https://tug.org/texlive/mirmon). + + - do: ```sh zcat < install-tl-unx.tar.gz | tar xf - @@ -183,7 +188,7 @@ Please read first the reference page on this matter: `/usr/local/texlive//bin/amd64-openbsd`: ```sh - cd /usr/local/texlive//bin/custom + cd /usr/local/texlive//bin ln -s custom amd64-openbsd ``` @@ -296,7 +301,7 @@ Building the sources - cmake - ninja - For asymptote: - - readline + - ~~readline~~ - freeglut - eigen3 - py3-cson, py3-qt5 and py3-numpy (run dependencies for `xasy`) @@ -306,11 +311,26 @@ Building the sources ./checkout-tl.sh ``` +> [NOTE!] +> During the so-called “pretest” phase, that is between February 8, +> and March 8 2025, use this command instead: +> ```sh +> ./checkout-tl.sh dev +> ``` + + ### Building ```sh ./tl-build.sh ``` +> [NOTE!] +> During the so-called “pretest” phase, that is between February 8, +> and March 8 2025, use this command instead: +> ```sh +> ./tl-build.sh dev +> ``` + ### Special considerations for biber [For the same reasons as in standard TeX Live](https://tug.org/texlive/build.html#biber), `biber` is not diff --git a/makefile b/makefile index 1cfe32e..7441949 100644 --- a/makefile +++ b/makefile @@ -1,4 +1,4 @@ -TL_YEAR?=2024 +TL_YEAR?=2025 PREFIX?=/usr/local/texlive/${TL_YEAR}/bin/custom BINREPO=https://www.ekdosis.org/texlive TMPDIR!=mktemp -d diff --git a/patches/patch-source-asymptote-fileio_cc b/patches/patch-source-asymptote-fileio_cc new file mode 100644 index 0000000..15d0a52 --- /dev/null +++ b/patches/patch-source-asymptote-fileio_cc @@ -0,0 +1,18 @@ +--- fileio.cc Sun Feb 9 11:32:40 2025 ++++ fileio.cc.1 Sun Feb 9 11:27:29 2025 +@@ -421,6 +421,8 @@ + if(errorstream::interrupt) throw interrupted(); + } + ++#if HAVE_LIBTIRPC ++ + void igzxfile::open() + { + name=locatefile(inpath(name)); +@@ -447,5 +449,6 @@ + processData().ixfile.remove(index); + } + } ++#endif + + } // namespace camp diff --git a/patches/patch-source-clisp-clispver_lispbibl_d b/patches/patch-source-clisp-clispver_lispbibl_d new file mode 100644 index 0000000..2eec681 --- /dev/null +++ b/patches/patch-source-clisp-clispver_lispbibl_d @@ -0,0 +1,18 @@ +--- src/lispbibl.d.orig 2013-06-17 14:15:17.000000000 +0000 ++++ src/lispbibl.d +@@ -9090,6 +9090,15 @@ All other long words on the LISP-Stack a + #define setSP(adresse) \ + ({ __asm__ __volatile__ ("movel %0,"REGISTER_PREFIX"sp" : : "g" ((aint)(adresse)) : "sp" ); }) + #define FAST_SP ++#elif defined(__clang__) && defined(__x86_64__) ++ /* Access to a register-"variable" %rsp */ ++ #define SP() \ ++ ({var aint __SP; \ ++ __asm__ __volatile__ ("movq %%rsp,%0" : "=g" (__SP) : ); \ ++ __SP; \ ++ }) ++ #define setSP(adresse) \ ++ ({ __asm__ __volatile__ ("movq %0,%%rsp" : : "g" ((aint)(adresse)) : "sp" ); }) + #elif (defined(GNU) || defined(INTEL)) && defined(I80386) && !defined(NO_ASM) + /* Access to a register-"variable" %esp */ + #define SP() \ diff --git a/tl-build.sh b/tl-build.sh index b538401..12e0463 100755 --- a/tl-build.sh +++ b/tl-build.sh @@ -4,6 +4,7 @@ this_dir=`pwd` tl_sourcedir=${this_dir}/source +patch_dir=${this_dir}/patches . ${this_dir}/variables.conf @@ -71,6 +72,7 @@ if [[ ${with_clisp} == "y" ]]; then $wget https://alpha.gnu.org/gnu/clisp/$clisp_ver.tar.bz2 bunzip2 -dc $clisp_ver.tar.bz2 | tar xf - cd $clisp_ver + cp ${patch_dir}/patch-source-clisp-clispver_lispbibl_d . && patch < patch-source-clisp-clispver_lispbibl_d ./configure CPPFLAGS=-DUNIX_BINARY_DISTRIB --prefix=$clisp_toolsdir \ --without-readline --without-dynamic-modules \ --disable-nls \ @@ -129,8 +131,9 @@ if [[ ${with_asymptote} == "y" ]];then cd ${tl_sourcedir}/utils/asymptote ./configure --prefix=/tmp/asyinst --enable-texlive-build \ --enable-static CXXFLAGS=-std=c++11 \ - --disable-curl --disable-lsp --disable-gsl --disable-fftw + --disable-curl --disable-lsp --disable-gsl --disable-fftw --disable-readline --disable-gc sed -i.bak -e 's/^LIBS = /LIBS = -static /' Makefile + cp ${patch_dir}/patch-source-asymptote-fileio_cc . && patch < patch-source-asymptote-fileio_cc gmake strip asy fi diff --git a/variables.conf b/variables.conf index 6247164..0cb4bbf 100644 --- a/variables.conf +++ b/variables.conf @@ -1 +1 @@ -TL_BRANCH=2024 +TL_BRANCH=2025 -- cgit v1.2.3