texlive[73800] Build/source/.github/scripts/build-asy.sh: Simplify

commits+preining at tug.org commits+preining at tug.org
Sun Feb 9 08:39:48 CET 2025


Revision: 73800
          https://tug.org/svn/texlive?view=revision&revision=73800
Author:   preining
Date:     2025-02-09 08:39:47 +0100 (Sun, 09 Feb 2025)
Log Message:
-----------
Simplify asy build scripts

Modified Paths:
--------------
    trunk/Build/source/.github/scripts/build-asy.sh

Modified: trunk/Build/source/.github/scripts/build-asy.sh
===================================================================
--- trunk/Build/source/.github/scripts/build-asy.sh	2025-02-09 03:54:05 UTC (rev 73799)
+++ trunk/Build/source/.github/scripts/build-asy.sh	2025-02-09 07:39:47 UTC (rev 73800)
@@ -30,7 +30,7 @@
        export LANG=C.UTF-8
        export LC_ALL=C.UTF-8
        apt-get update -q -y
-       apt-get install -y --no-install-recommends bash gcc g++ make perl libfontconfig-dev libx11-dev libxmu-dev libxaw7-dev build-essential
+       apt-get install -y --no-install-recommends bash gcc g++ make perl libfontconfig-dev libx11-dev libxmu-dev libxaw7-dev build-essential libtool-bin
        apt-get install -y --no-install-recommends build-essential pkg-config libeigen3-dev libcurl4-openssl-dev libreadline-dev libboost-filesystem-dev flex libglu1-mesa-dev freeglut3-dev libosmesa6-dev libreadline6-dev zlib1g-dev bison libglm-dev libncurses-dev python3 libtirpc-dev
        ;;
      freebsd)
@@ -62,8 +62,8 @@
     export TL_MAKE=gmake
     export CC=gcc
     export CXX=g++
-    export CFLAGS=-D_NETBSD_SOURCE
-    export CXXFLAGS='-D_NETBSD_SOURCE -std=c++11'
+    #export CFLAGS=-D_NETBSD_SOURCE
+    #export CXXFLAGS='-D_NETBSD_SOURCE -std=c++11'
     ;;
 esac
 
@@ -74,18 +74,11 @@
 touch ./utils/asymptote/GUI/pyUIClass/*
 
 cd utils/asymptote
-./configure --prefix=/tmp/asyinst --enable-static --enable-texlive-build CXXFLAGS=-std=c++11 \
+./configure --prefix=/tmp/asyinst --enable-static --enable-texlive-build \
 	--disable-gsl --disable-fftw --disable-lsp --disable-curl
+	LDFLAGS="-static-libgcc -static-libstdc++"
 $TL_MAKE -j2
 
-# relink with static libtirpc if possible
-sed -i -e '/^LFLAGS/s/-ltirpc/-Wl,-Bstatic -ltirpc -Wl,-Bdynamic/' Makefile
-
-# as of 2.88 necessary
-# static linking of stdc++
-sed -i -e '/^LFLAG/s/= /= -static-libgcc -static-libstdc++ /' Makefile
-$TL_MAKE
-
 strip asy
 
 mv asy ../../asy-$arch



More information about the tex-live-commits mailing list.