diff options
author | Norbert Preining <preining@logic.at> | 2024-01-24 09:41:48 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2024-01-24 09:41:48 +0000 |
commit | 0cb12c093f0d7376946e58e9aa20917c813f6776 (patch) | |
tree | 2d6873081d8e4ddd379f159fb368f4868005f52b | |
parent | 5e6c9febe87fc0c63ca2622c35bf5d3f0acf2262 (diff) |
[gh actions] work on solaris, fix comments
git-svn-id: svn://tug.org/texlive/trunk@69572 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-x | Build/source/.github/scripts/build-tl.sh | 15 | ||||
-rw-r--r-- | Build/source/.github/workflows/main.yml | 6 |
2 files changed, 13 insertions, 8 deletions
diff --git a/Build/source/.github/scripts/build-tl.sh b/Build/source/.github/scripts/build-tl.sh index e6a0e8a20fb..1e2be7dc762 100755 --- a/Build/source/.github/scripts/build-tl.sh +++ b/Build/source/.github/scripts/build-tl.sh @@ -49,6 +49,9 @@ then pkg_add gmake gcc pkgconf libX11 libXt libXaw fontconfig perl5 ;; solaris) + pkg install pkg://solaris/developer/gcc-5 + # maybe only the following is enough, and fortran and gobjc needs not be installed? + # pkg install pkg://solaris/developer/gcc/gcc-c++-5 pkg://solaris/developer/gcc/gcc-c++-5 echo "Solaris support is WIP, please help!" >&2 exit 1 ;; @@ -92,8 +95,16 @@ case "$arch" in BUILDARGS="--enable-arm-neon=on" ;; *-solaris) - export CC="/path/to/gcc-5.5 -m64" - export CXX="/path/to/g++-5.5 -m64" + export PATH=/opt/csw/bin:$PATH + export TL_MAKE=gmake + if [ $arch = "i386-solaris" ] + then + export CC="gcc -m32" + export CXX="g++ -m32" + else + export CC="gcc -m64" + export CXX="g++ -m64" + fi ;; *-freebsd) export TL_MAKE=gmake diff --git a/Build/source/.github/workflows/main.yml b/Build/source/.github/workflows/main.yml index 2a1f9f5c9d2..a0a6b06c109 100644 --- a/Build/source/.github/workflows/main.yml +++ b/Build/source/.github/workflows/main.yml @@ -21,12 +21,6 @@ # and there should be binaries for the new "release". # * use tl-update-bindir. # -# The actual code for building and running is in the Github Action -# TeX-Live/tl-build-docker-action -# -# TODO -# * it would be nice if we could adjust the docker action usage -# to override the dockerfile but this seems not to be possible at the moment # only build on pushed to trunk on: |