diff options
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-x | Master/tlpkg/bin/c2l | 3 | ||||
-rwxr-xr-x | Master/tlpkg/bin/tl-update-asy | 13 |
2 files changed, 6 insertions, 10 deletions
diff --git a/Master/tlpkg/bin/c2l b/Master/tlpkg/bin/c2l index d919c56aa99..c90c2bfa6b0 100755 --- a/Master/tlpkg/bin/c2l +++ b/Master/tlpkg/bin/c2l @@ -28,8 +28,7 @@ sub main { $arg = "i386-cygwin"; } elsif ($arg eq "dar32") { $arg = "i386-darwin"; - } elsif ($arg eq "darwin" || $arg eq "dar" - || $arg eq "mac" || $arg eq "mactex") { + } elsif ($arg eq "darwin" || $arg eq "dar" || $arg eq "mac") { $arg = "x86_64-darwin"; } elsif ($arg eq "darleg") { $arg = "x86_64-darwinlegacy"; diff --git a/Master/tlpkg/bin/tl-update-asy b/Master/tlpkg/bin/tl-update-asy index 62f3ce20fc1..7994b6343e0 100755 --- a/Master/tlpkg/bin/tl-update-asy +++ b/Master/tlpkg/bin/tl-update-asy @@ -22,16 +22,16 @@ if false && $update_sources_from_ctan; then \cp -arf /home/ftp/tex-archive/graphics/asymptote/ . cd asymptote - ver=`awk -F\" '{print $2}' revision.cc` # the newly-released version + ver=`awk -F\" '{print $2}' revision.cc | sed 1q` # the newly-released version echo $ver # show list of new files to add: svn status | sed -n 's/^\?//p' | fgrep -v binaries svn add `!!` - # show list of files to remove (keep free) + # show list of files to remove (keep gc-7.6.2 until new is working): diff -qr . /home/ftp/tex-archive/graphics/asymptote/ \ - | egrep -v ' differ' | egrep -v '\.svn' + | egrep -v ' differ' | egrep -v '\.svn|gc-7.6.2' svn rm ... # final check and commit: @@ -45,7 +45,7 @@ elif test "x$1" = x--build; then # Despite all the dire warnings above, this part actually can be run # as a script, because it's so often necessary to redo. set -e - PATH=/usr/bin:/bin:/sbin; export PATH # system gcc for sake of shared libs + PATH=/usr/bin:/usr/sbin; export PATH # system gcc for sake of shared libs #PATH=/usr/local/bin:$PATH # need new gs to pass tests, but ok PATH=$lb:$PATH # get our kpsewhich svn=/usr/local/bin/svn # so we need our svn explicitly @@ -63,13 +63,10 @@ elif test "x$1" = x--build; then fi rm -rf config.cache config.h config.log config.status errors.temp rm -rf /tmp/ainst autom4te.cache - # these configure options represent what is intended to be supported - # in the x86_64-linux build. - ASYMPTOTE_EPSDRIVER=epswrite; export ASYMPTOTE_EPSDRIVER ./configure --prefix=/tmp/ainst \ --with-latex=/tmp/ainst/latex --with-context=/tmp/ainst/context \ --disable-fftw --disable-gl --disable-gsl \ - --enable-texlive-build CFLAGS=-g CXXFLAGS="-std=c++11 -DNOHASH" #-ansi + --enable-texlive-build CFLAGS=-g CXXFLAGS=-std=c++11 #-ansi make make check make install-prebuilt |