Changeset ed3707e


Ignore:
Timestamp:
07/31/2022 04:07:10 AM (21 months ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/soup3, xry111/xf86-video-removal
Children:
bd0723e
Parents:
c38d051
Message:

Editorial updates to Typesetting chapter

Moved the profile script to texlive.sh from extrapaths.sh.

Created an environment variable TEXLIVE_PREFIX and incorporated
it into the chapter's build scripts.

An additional optimization can still be made by moving the
TEXARCH variable into texlive.sh and removing it from
package instructions.

Location:
pst/typesetting
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • pst/typesetting/asymptote.xml

    rc38d051 red3707e  
    155155<screen><userinput>export TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/') &amp;&amp;
    156156
    157 ./configure --prefix=/opt/texlive/&texlive-year;                          \
    158             --bindir=/opt/texlive/&texlive-year;/bin/$TEXARCH             \
    159             --datarootdir=/opt/texlive/&texlive-year;/texmf-dist          \
    160             --infodir=/opt/texlive/&texlive-year;/texmf-dist/doc/info     \
    161             --libdir=/opt/texlive/&texlive-year;/texmf-dist               \
    162             --mandir=/opt/texlive/&texlive-year;/texmf-dist/doc/man       \
    163             --disable-lsp                                       \
    164             --enable-gc=system                                  \
    165             --with-latex=/opt/texlive/&texlive-year;/texmf-dist/tex/latex \
    166             --with-context=/opt/texlive/&texlive-year;/texmf-dist/tex/context/third &amp;&amp;
     157./configure --prefix=$TEXLIVE_PREFIX                          \
     158            --bindir=$TEXLIVE_PREFIX/bin/$TEXARCH             \
     159            --datarootdir=$TEXLIVE_PREFIX/texmf-dist          \
     160            --infodir=$TEXLIVE_PREFIX/texmf-dist/doc/info     \
     161            --libdir=$TEXLIVE_PREFIX/texmf-dist               \
     162            --mandir=$TEXLIVE_PREFIX/texmf-dist/doc/man       \
     163            --disable-lsp                                     \
     164            --enable-gc=system                                \
     165            --with-latex=$TEXLIVE_PREFIX/texmf-dist/tex/latex \
     166            --with-context=$TEXLIVE_PREFIX/texmf-dist/tex/context/third &amp;&amp;
    167167
    168168make</userinput></screen>
     
    187187
    188188    <para>
    189       <parameter>--libdir=/opt/texlive/&texlive-year;/texmf-dist;</parameter>:
     189      <parameter>--libdir=$TEXLIVE_PREFIX/texmf-dist;</parameter>:
    190190      This parameter ensures that the <filename
    191191      class="directory">asymptote</filename> directory will similarly
     
    246246        </seg>
    247247        <seg>
    248           /opt/texlive/&texlive-year;texmf-dist/asymptote,
    249           /opt/texlive/&texlive-year;/doc/asymptote,
    250           /opt/texlive/&texlive-year;/info/asymptote
     248          $TEXLIVE_PREFIX/texmf-dist/asymptote,
     249          $TEXLIVE_PREFIX/doc/asymptote,
     250          $TEXLIVE_PREFIX/info/asymptote
    251251        </seg>
    252252      </seglistitem>
  • pst/typesetting/dvisvgm.xml

    rc38d051 red3707e  
    122122    </para>
    123123
    124 <screen role="root"><userinput>ln -svf /opt/texlive/&texlive-year;/lib/libkpathsea.so /usr/lib</userinput></screen>
     124<screen role="root"><userinput>ln -svf $TEXLIVE_PREFIX/lib/libkpathsea.so /usr/lib</userinput></screen>
    125125
    126126    <para>
     
    136136    </para>
    137137
    138 <screen><userinput>sed -i 's/python/&amp;3/' tests/Makefile.in       &amp;&amp;
    139 ./configure                                    \
    140  --bindir=/opt/texlive/&texlive-year;/bin/${TEXARCH}     \
    141  --mandir=/opt/texlive/&texlive-year;/texmf-dist/doc/man \
    142  --with-kpathsea=/opt/texlive/&texlive-year;            &amp;&amp;
     138<screen><userinput>sed -i 's/python/&amp;3/' tests/Makefile.in         &amp;&amp;
     139./configure                                     \
     140    --bindir=$TEXLIVE_PREFIX/bin/${TEXARCH}     \
     141    --mandir=$TEXLIVE_PREFIX/texmf-dist/doc/man \
     142    --with-kpathsea=$TEXLIVE_PREFIX             &amp;&amp;
    143143make</userinput></screen>
    144144
     
    159159
    160160    <para>
    161       <command>ln -svf /opt/texlive/&texlive-year;/lib/libkpathsea.so /usr/lib</command>:
     161      <command>ln -svf $TEXLIVE_PREFIX/lib/libkpathsea.so /usr/lib</command>:
    162162      Without this, the program will not link correctly,
    163163    </para>
     
    179179      in explaining how to regenerate it. ken -->
    180180    <para>
    181       <command>--with-kpathsea=/opt/texlive/&texlive-year;</command>: This allows
     181      <command>--with-kpathsea=$TEXLIVE_PREFIX</command>: This allows
    182182      the build system to find the headers for <filename
    183183      class="libraryfile">kpathsea</filename>
  • pst/typesetting/tex-path.xml

    rc38d051 red3707e  
    1919    that the system can properly find the files.  If you set up your login
    2020    scripts as recommended in <xref linkend='postlfs-config-profile'/>, update
    21     the needed paths by appending to the
    22     <filename>extrapaths.sh</filename> script. The programs are always
     21    the needed paths by creating the
     22    <filename>texlive.sh</filename> script. The programs are always
    2323    installed in an &lt;ARCH&gt;-linux subdirectory and on 32-bit x86 this is
    2424    always i386-linux. For x86_64 and i?86 we can generate this as $TEXARCH:
     
    2828    <para>
    2929      If upgrading from a previous year's version, you should manually
    30       edit <filename>extrapaths.sh</filename> to ensure that the version for
     30      edit <filename>texlive.sh</filename> to ensure that the version for
    3131      the year you wish to use is the only TeX present (some people need to
    3232      keep multiple years available to ensure there are no regressions in
     
    3737<!-- EOF should NOT be in double quotes, we want it to evaluate $TEXARCH -->
    3838<!-- this is also in texlive.xml -->
    39 <screen role="root"><userinput>export TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/') &amp;&amp;
     39   <para>Now, create the texlive.sh script as the &root; user:</para>
    4040
    41 cat &gt;&gt; /etc/profile.d/extrapaths.sh &lt;&lt; EOF
    42 <literal>
    43 # Begin texlive addition
     41<screen role="root"><userinput>TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/')
    4442
    45 pathappend /opt/texlive/&texlive-year;/texmf-dist/doc/man  MANPATH
    46 pathappend /opt/texlive/&texlive-year;/texmf-dist/doc/info INFOPATH
    47 pathappend /opt/texlive/&texlive-year;/bin/$TEXARCH
     43cat &gt; /etc/profile.d/texlive.sh &lt;&lt; EOF
     44<literal># Begin texlive setup
     45TEXLIVE_PREFIX=/opt/texlive/&texlive-year;
     46export TEXLIVE_PREFIX
    4847
    49 # End texlive addition
    50 </literal>
     48pathappend \$TEXLIVE_PREFIX/texmf-dist/doc/man  MANPATH
     49pathappend \$TEXLIVE_PREFIX/texmf-dist/doc/info INFOPATH
     50pathappend \$TEXLIVE_PREFIX/bin/$TEXARCH
     51
     52# End texlive setup</literal>
    5153EOF
    5254
    5355unset TEXARCH</userinput></screen>
    54 
    5556
    5657  <note>
     
    6061      procedure, the pathappend function will ensure duplicates are
    6162      removed, so including them here will do no harm.
     63    </para>
     64  </note>
     65
     66  <note>
     67    <para>
     68      The backslashes before the dollar signs in the script above are to
     69      facilitate a copy/paste operation. The backslashes should not
     70      appear in the actual script.
    6271    </para>
    6372  </note>
  • pst/typesetting/texlive.xml

    rc38d051 red3707e  
    7676      built after installing this package. If you have not already done so, you
    7777      should start at <xref linkend="tex-path"/> so that the final commands to
    78       initialise the new installation will be found.
     78      initialize the new installation will be found.
    7979    </para>
    8080
     
    243243        <application>xindy</application>) have been installed, you will need to
    244244        reinstall those as well as fixing up your <literal>PATH</literal> for
    245         <literal>/opt/texlive/&texlive-year;</literal>.
     245        <literal>$TEXLIVE_PREFIX</literal>.
    246246      </para>
    247247    </caution>
     
    254254
    255255<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; EOF
    256 <literal># Begin texlive &texlive-year; addition
    257 
    258 /opt/texlive/&texlive-year;/lib
    259 
    260 # End texlive &texlive-year; addition</literal>
     256<literal># Begin texlive addition
     257
     258$TEXLIVE_PREFIX/lib
     259
     260# End texlive addition</literal>
    261261EOF</userinput></screen>
    262262
     
    273273    </para>
    274274
    275 <screen><userinput>export TEXARCH=$(uname -m |
    276  sed -e 's/i.86/i386/' -e 's/$/-linux/')                 &amp;&amp;
     275<screen><userinput>export TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/') &amp;&amp;
    277276
    278277mkdir texlive-build &amp;&amp;
    279 cd texlive-build    &amp;&amp;
    280 
    281 ../configure                                        \
    282     --prefix=/opt/texlive/&texlive-year;                      \
    283     --bindir=/opt/texlive/&texlive-year;/bin/$TEXARCH         \
    284     --datarootdir=/opt/texlive/&texlive-year;                 \
    285     --includedir=/opt/texlive/&texlive-year;/include          \
    286     --infodir=/opt/texlive/&texlive-year;/texmf-dist/doc/info \
    287     --libdir=/opt/texlive/&texlive-year;/lib                  \
    288     --mandir=/opt/texlive/&texlive-year;/texmf-dist/doc/man   \
    289     --disable-native-texlive-build                  \
    290     --disable-static --enable-shared                \
    291     --disable-dvisvgm                               \
    292     --with-system-cairo                             \
    293     --with-system-fontconfig                        \
    294     --with-system-freetype2                         \
    295     --with-system-gmp                               \
    296     --with-system-graphite2                         \
    297     --with-system-harfbuzz                          \
    298     --with-system-icu                               \
    299     --with-system-libgs                             \
    300     --with-system-libpaper                          \
    301     --with-system-libpng                            \
    302     --with-system-mpfr                              \
    303     --with-system-pixman                            \
    304     --with-system-zlib                              \
     278cd    texlive-build &amp;&amp;
     279
     280../configure                                      \
     281    --prefix=$TEXLIVE_PREFIX                      \
     282    --bindir=$TEXLIVE_PREFIX/bin/$TEXARCH         \
     283    --datarootdir=$TEXLIVE_PREFIX                 \
     284    --includedir=$TEXLIVE_PREFIX/include          \
     285    --infodir=$TEXLIVE_PREFIX/texmf-dist/doc/info \
     286    --libdir=$TEXLIVE_PREFIX/lib                  \
     287    --mandir=$TEXLIVE_PREFIX/texmf-dist/doc/man   \
     288    --disable-native-texlive-build                \
     289    --disable-static --enable-shared              \
     290    --disable-dvisvgm                             \
     291    --with-system-cairo                           \
     292    --with-system-fontconfig                      \
     293    --with-system-freetype2                       \
     294    --with-system-gmp                             \
     295    --with-system-graphite2                       \
     296    --with-system-harfbuzz                        \
     297    --with-system-icu                             \
     298    --with-system-libgs                           \
     299    --with-system-libpaper                        \
     300    --with-system-libpng                          \
     301    --with-system-mpfr                            \
     302    --with-system-pixman                          \
     303    --with-system-zlib                            \
    305304    --with-banner-add=" - BLFS" &amp;&amp;
    306305
     
    318317DESTDIR#some/where -->
    319318<screen role="root"><userinput>make install-strip &amp;&amp;
    320 /sbin/ldconfig &amp;&amp;
    321 make texlinks &amp;&amp;
    322 mkdir -pv /opt/texlive/&texlive-year;/tlpkg/TeXLive/ &amp;&amp;
    323 install -v -m644 ../texk/tests/TeXLive/* /opt/texlive/&texlive-year;/tlpkg/TeXLive/ &amp;&amp;
    324 tar -xf ../../texlive-&tex-tlpdb-version;-tlpdb-full.tar.gz -C /opt/texlive/&texlive-year;/tlpkg</userinput></screen>
     319/sbin/ldconfig     &amp;&amp;
     320make texlinks      &amp;&amp;
     321mkdir -pv                                $TEXLIVE_PREFIX/tlpkg/TeXLive/ &amp;&amp;
     322install -v -m644 ../texk/tests/TeXLive/* $TEXLIVE_PREFIX/tlpkg/TeXLive/ &amp;&amp;
     323tar -xf ../../texlive-&tex-tlpdb-version;-tlpdb-full.tar.gz -C $TEXLIVE_PREFIX/tlpkg</userinput></screen>
    325324
    326325    <note>
     
    339338<!-- if texmf does not need to be patched, remove &amp;&amp; from first line,
    340339 close userinput, screen, comment pushd, patch, popd -->
    341 <screen role="root"><userinput>tar -xf ../../texlive-&texmf-version;-texmf.tar.xz -C /opt/texlive/&texlive-year; --strip-components=1</userinput></screen>
     340<screen role="root"><userinput>tar -xf ../../texlive-&texmf-version;-texmf.tar.xz -C $TEXLIVE_PREFIX --strip-components=1</userinput></screen>
    342341
    343342    <para>
     
    349348    </para>
    350349
    351 <screen role="root"><userinput>for F in /opt/texlive/&texlive-year;/texmf-dist/scripts/latex-make/*.py ; do
     350<screen role="root"><userinput>for F in $TEXLIVE_PREFIX/texmf-dist/scripts/latex-make/*.py ; do
    352351  sed -i 's%/usr/bin/env python%/usr/bin/python3%' $F
    353352done
     
    356355    <para>
    357356      Still as the <systemitem class="username">root</systemitem> user,
    358       initialise the new system (the commands <command>fmtutil-sys
     357      initialize the new system (the commands <command>fmtutil-sys
    359358      --all</command> and <command>mtxrun --generate</command> will produce
    360359      a <emphasis>lot</emphasis> of output):
     
    421420
    422421    <para>
    423       <command>tar -xf texlive-&texmf-version;-texmf.tar.xz -C /opt/texlive/&texlive-year; --strip-components=1</command>:
     422      <command>tar -xf texlive-&texmf-version;-texmf.tar.xz -C $TEXLIVE_PREFIX --strip-components=1</command>:
    424423      the tarball contains the files for the texmf-dist directory, and because
    425424      of its size we do not want to waste time and space untarring it and then
     
    429428    <para>
    430429      <command>install -v -m644 ../texk/tests/TeXLive/*
    431       /opt/texlive/&texlive-year;/tlpkg/TeXLive/</command>: This puts the perl
     430      $TEXLIVE_PREFIX/tlpkg/TeXLive/</command>: This puts the perl
    432431      modules <filename>TLConfig.pm</filename> and <filename>TLUtils.pm</filename>
    433432      into the directory where the binary installer puts them - it is at the
     
    462461      <seglistitem>
    463462        <seg>Over 300 binaries and symlinks to scripts</seg>
    464         <seg>libkpathsea.so, libptexenc.so, libsynctex.so, libtexlua52.so,
    465         libtexluajit.so</seg>
    466         <seg>/opt/texlive/&texlive-year;/bin, /opt/texlive/&texlive-year;/include,
    467         /opt/texlive/&texlive-year;/lib, /opt/texlive/&texlive-year;/texmf-dist</seg>
     463        <seg>libkpathsea.so,
     464             libptexenc.so,
     465             libsynctex.so,
     466             libtexlua52.so,
     467             libtexluajit.so
     468        </seg>
     469        <seg>$TEXLIVE_PREFIX/bin,
     470             $TEXLIVE_PREFIX/include,
     471             $TEXLIVE_PREFIX/lib,
     472             $TEXLIVE_PREFIX/texmf-dist
     473        </seg>
    468474      </seglistitem>
    469475    </segmentedlist>
  • pst/typesetting/tl-installer.xml

    rc38d051 red3707e  
    186186        the builder's toolchain and your hardware.  In most of TeX this will
    187187        probably not matter, but in uncommon corner cases you might hit
    188         problems.  e.g. if your x86_64 processor does not support 3dnowext or
     188        problems. For example, if your x86_64 processor does not support 3dnowext or
    189189        3dnow, the 2014-06-28 binary failed in conTeXt when running LuaTeX,
    190190        although lualatex worked, as did the i686 binaries on the same
     
    236236      <option>./install-tl --location
    237237      http://mirror.aut.ac.nz/CTAN/systems/texlive/tlnet/</option>: use a
    238       variation of this if you wish to use a different mirror, e.g. because
     238      variation of this if you wish to use a different mirror, for example, because
    239239      you are in New Zealand but the installer chooses to use an Australian
    240240      mirror. The list of mirrors is at http://ctan.org/mirrors.
  • pst/typesetting/xindy.xml

    rc38d051 red3707e  
    113113patch -Np1 -i ../xindy-&xindy-version;-upstream_fixes-2.patch &amp;&amp;
    114114
    115 ./configure --prefix=/opt/texlive/&texlive-year;              \
    116             --bindir=/opt/texlive/&texlive-year;/bin/$TEXARCH \
    117             --datarootdir=/opt/texlive/&texlive-year;         \
    118             --includedir=/usr/include               \
    119             --libdir=/opt/texlive/&texlive-year;/texmf-dist   \
    120             --mandir=/opt/texlive/&texlive-year;/texmf-dist/doc/man &amp;&amp;
     115./configure --prefix=$TEXLIVE_PREFIX              \
     116            --bindir=$TEXLIVE_PREFIX/bin/$TEXARCH \
     117            --datarootdir=$TEXLIVE_PREFIX         \
     118            --includedir=/usr/include             \
     119            --libdir=$TEXLIVE_PREFIX/texmf-dist   \
     120            --mandir=$TEXLIVE_PREFIX/texmf-dist/doc/man &amp;&amp;
    121121
    122122make LC_ALL=POSIX</userinput></screen>
     
    200200        </seg>
    201201        <seg>
    202           /opt/texlive/&texlive-year;/texmf-dist/xindy
     202          $TEXLIVE_PREFIX/texmf-dist/xindy
    203203        </seg>
    204204      </seglistitem>
Note: See TracChangeset for help on using the changeset viewer.