diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 2b423cd0b0..a24a35127b 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -46,6 +46,11 @@ February 15th, 2014 + + [ken] - add instructions to build asymptote within TeX Live. + This completes the current work (i.e. everything except xindy) for + #4647. + [fernando] - Update to cups-filters 1.0.45. Fixes #4694. diff --git a/pst/typesetting/texlive.xml b/pst/typesetting/texlive.xml index 6966d4a0fc..d0ba2b5621 100644 --- a/pst/typesetting/texlive.xml +++ b/pst/typesetting/texlive.xml @@ -58,6 +58,16 @@ + Additional Downloads + + + + Required patch: + + + + + TeX Live Dependencies Recommended @@ -129,10 +139,16 @@ what was originally installed. At the moment, these instructions do not rebuild - asy and xindy which were - installed by the binary installer. + xindy which was installed by the binary installer. + If you wish to rebuild that, please consult + #4647. Asy and the rest of + asymptote is by default not rebuilt, so we have to separately run + configure and make in its directory. + -mkdir texlive-build && +patch -Np1 -i ../texlive-&texlive-version;-source-fix_asymptote-1.patch && + +mkdir texlive-build && cd texlive-build && ../configure --prefix=/opt/texlive/2013 \ @@ -158,14 +174,30 @@ cd texlive-build && --with-system-pixman \ --with-system-zlib \ --with-banner-add=" - BLFS" && -make - To test the results, issue: make -k check. +pushd ../utils/asymptote && +echo "ac_cv_lib_m_sqrt=yes" >config.cache && +echo "ac_cv_lib_z_deflate=yes" >>config.cache && +./configure LIBS="-ltirpc " --prefix=/opt/texlive/2013/ \ + --bindir=/opt/texlive/2013/bin/x86_64-linux \ + --enable-texlive-build \ + --datarootdir=/opt/texlive/2013/texmf-dist \ + --infodir=/opt/texlive/2013/texmf-dist/doc/info/ \ + --mandir=/opt/texlive/2013/texmf-dist/doc/man \ + --cache-file=config.cache && +popd && + +make && +make -C ../utils/asymptote + + To test the results, issue: make -k chec && + make -C utils/asymptote checkk. Now, as the root user: -make install +make install && +make -C ../utils/asymptote install @@ -210,7 +242,18 @@ make - : use this if you do not have Xorg installed. + echo "ac_cv_lib_m_sqrt=yes" ... LIBS="-ltirpc " >config.cache, + ... --cache-file=config.cache : The configure scripts in + TeX Live are uncommon. Asymptote not only has to + be separately configured and built, the configure script fails to find the + shared libtirpc.so. Passing that + in LIBS breaks the tests for (static) libm and (shared) libz, so we have to + fix things up, in much the same way as when cross-compiling. + + + + : use this (and omit the configure and make in + utils/asymptote if you do not have Xorg installed.