Changeset 1c9985f


Ignore:
Timestamp:
Dec 18, 2013, 12:35:49 AM (11 years ago)
Author:
Chris Staub <chris@…>
Children:
026bb5d
Parents:
d240b159
Message:

Updated m4 to use simplified xml, for real

Location:
BOOK
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • BOOK/cross-tools/common/m4.xml

    rd240b159 r1c9985f  
    11<?xml version="1.0" encoding="ISO-8859-1"?>
    2 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    3   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
     2<!DOCTYPE c:package [
    43  <!ENTITY % general-entities SYSTEM "../../general.ent">
    54  %general-entities;
    65]>
    76
    8 <sect1 id="ch-cross-tools-m4" role="wrap">
    9   <?dbhtml filename="m4.html"?>
     7<c:package xmlns:c="http://schema.cross-lfs.org/book"
     8           xmlns:xi="http://www.w3.org/2001/XInclude"
     9           id="ch-cross-tools-m4" c:multibuild="false">
    1010
    11   <title>M4-&m4-version;</title>
     11  <c:title>M4</c:title>
     12  <c:version>&m4-version;</c:version>
     13  <c:variant>cross-tools</c:variant>
    1214
    13   <indexterm zone="ch-cross-tools-m4">
    14     <primary sortas="a-M4">M4</primary>
    15     <secondary>temporary system</secondary>
    16   </indexterm>
     15  <xi:include href="../../final-system/common/m4.xml"
     16  xpointer="xmlns(co=http://schema.cross-lfs.org/book)
     17            xpointer(/co:package/co:description[1])" />
    1718
    18   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    19   href="../../final-system/common/m4.xml"
    20   xpointer="xpointer(//*[@role='package'])"/>
     19<c:install> 
    2120
    22   <sect2 role="installation">
    23     <title>Installation of M4</title>
     21    <c:para>Prepare M4 for compilation:</c:para>
    2422
    25     <para os="a">Prepare M4 for compilation:</para>
     23<c:command>./configure --prefix=/cross-tools</c:command>
    2624
    27 <screen os="b"><userinput>./configure --prefix=/cross-tools</userinput></screen>
     25    <c:para>Compile the package:</c:para>
    2826
    29     <para os="c">Compile the package:</para>
     27<c:command>make</c:command>
    3028
    31 <screen os="d"><userinput>make</userinput></screen>
     29    <c:para>Install the package:</c:para>
    3230
    33     <para os="e">Install the package:</para>
     31<c:command>make install</c:command>
    3432
    35 <screen os="f"><userinput>make install</userinput></screen>
     33  </c:install>
    3634
    37   </sect2>
     35  <c:contents c:ref="ch-system-m4" />
    3836
    39   <sect2 role="content">
    40     <title/>
    41 
    42     <para>Details on this package are located in <xref
    43     linkend="contents-m4" role="."/></para>
    44 
    45   </sect2>
    46 
    47 </sect1>
     37</c:package>

  • BOOK/final-system/common/m4.xml

    rd240b159 r1c9985f  
    11<?xml version="1.0" encoding="ISO-8859-1"?>
    2 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    3   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
     2<!DOCTYPE c:package [
    43  <!ENTITY % general-entities SYSTEM "../../general.ent">
    54  %general-entities;
    65]>
    76
    8 <sect1 id="ch-system-m4" role="wrap">
    9   <?dbhtml filename="m4.html"?>
     7<c:package xmlns:c="http://schema.cross-lfs.org/book"
     8           id="ch-system-m4" c:multibuild="false">
    109
    11   <title>M4-&m4-version;</title>
     10  <c:title>M4</c:title>
     11  <c:version>&m4-version;</c:version> 
     12  <c:description>The M4 package contains a macro processor.</c:description>
    1213
    13   <indexterm zone="ch-system-m4">
    14     <primary sortas="a-M4">M4</primary>
    15   </indexterm>
     14  <c:install>
    1615
    17   <sect2 role="package">
    18     <title/>
     16    <c:para>Prepare M4 for compilation:</c:para>
    1917
    20     <para>The M4 package contains a macro processor.</para>
     18    <c:command c:multilib="false">./configure --prefix=/usr</c:command>
     19    <c:command c:multilib="true">CC="gcc ${BUILD64}" ./configure --prefix=/usr</c:command>
    2120
    22   </sect2>
     21    <c:para>Compile the package:</c:para>
    2322
    24   <sect2 role="installation">
    25     <title>Installation of M4</title>
     23    <c:command>make</c:command>
    2624
    27     <para os="a">Prepare M4 for compilation:</para>
     25    <c:para>To test the results, issue:
     26    <c:command>make check</c:command>.</c:para>
    2827
    29 <screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
     28    <c:para>Install the package:</c:para>
    3029
    31     <para os="c">Compile the package:</para>
     30    <c:command>make install</c:command>
    3231
    33 <screen os="d"><userinput>make</userinput></screen>
     32  </c:install>
    3433
    35     <para os="e">To test the results, issue:
    36     <userinput>make check</userinput>.</para>
     34  <c:contents>
    3735
    38     <para os="f">Install the package:</para>
    39 
    40 <screen os="g"><userinput>make install</userinput></screen>
    41 
    42   </sect2>
    43 
    44   <sect2 id="contents-m4" role="content">
    45     <title>Contents of M4</title>
    46 
    47     <segmentedlist>
    48       <segtitle>Installed program</segtitle>
    49 
    50       <seglistitem>
    51         <seg>m4</seg>
    52       </seglistitem>
    53     </segmentedlist>
    54 
    55     <variablelist>
    56       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
    57       <?dbfo list-presentation="list"?>
    58       <?dbhtml list-presentation="table"?>
    59 
    60       <varlistentry id="m4">
    61          <!-- Don't remove the extra space, it prevet a FOP warning. -->
    62         <term><command>m4 </command></term>
    63         <listitem>
    64           <para>copies the given files while expanding the macros that they
     36    <c:program>
     37      <c:name>m4</c:name>
     38          <c:description>copies the given files while expanding the macros that they
    6539          contain. These macros are either built-in or user-defined and can
    6640          take any number of arguments. Besides performing macro expansion,
    67           <command>m4</command> has built-in functions for including named
     41          <c:command>m4</c:command> has built-in functions for including named
    6842          files, running Unix commands, performing integer arithmetic,
    69           manipulating text, recursion, etc. The <command>m4</command>
     43          manipulating text, recursion, etc. The <c:command>m4</c:command>
    7044          program can be used either as a front-end to a compiler or as a
    71           macro processor in its own right.</para>
    72           <indexterm zone="ch-system-m4 m4">
    73             <primary sortas="b-m4">m4</primary>
    74           </indexterm>
    75         </listitem>
    76       </varlistentry>
     45          macro processor in its own right.</c:description>
     46    </c:program>
    7747
    78     </variablelist>
     48  </c:contents>
    7949
    80   </sect2>
    81 
    82 </sect1>
     50</c:package>

  • BOOK/final-system/mips64-chapter.xml

    rd240b159 r1c9985f  
    5858  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
    5959  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
    60   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
     60  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
    6161  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
    6262  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-n32.xml"/>

  • BOOK/final-system/ppc64-chapter.xml

    rd240b159 r1c9985f  
    4848  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
    4949  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
    50   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
     50  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
    5151  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
    5252  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-64bit.xml"/>

  • BOOK/final-system/sparc64-chapter.xml

    rd240b159 r1c9985f  
    4848  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
    4949  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
    50   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
     50  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
    5151  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
    5252  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-64bit.xml"/>

  • BOOK/final-system/x86_64-chapter.xml

    rd240b159 r1c9985f  
    4848  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
    4949  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
    50   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
     50  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
    5151  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison.xml"/>
    5252  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bison-64bit.xml"/>

  • BOOK/temp-system/common/m4.xml

    rd240b159 r1c9985f  
    11<?xml version="1.0" encoding="ISO-8859-1"?>
    2 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    3   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
     2<!DOCTYPE c:package [
    43  <!ENTITY % general-entities SYSTEM "../../general.ent">
    54  %general-entities;
    65]>
    76
    8 <sect1 id="ch-temp-system-m4" role="wrap">
    9   <?dbhtml filename="m4.html"?>
     7<c:package xmlns:c="http://schema.cross-lfs.org/book"
     8           xmlns:xi="http://www.w3.org/2001/XInclude"
     9           id="ch-temp-system-m4" c:multibuild="false">
    1010
    11   <title>M4-&m4-version;</title>
     11  <c:title>M4</c:title>
     12  <c:version>&m4-version;</c:version>
     13  <c:variant>temporary system</c:variant>
    1214
    13   <indexterm zone="ch-temp-system-m4">
    14     <primary sortas="a-M4">M4</primary>
    15     <secondary>temporary system</secondary>
    16   </indexterm>
     15  <xi:include href="../../final-system/common/m4.xml"
     16  xpointer="xmlns(co=http://schema.cross-lfs.org/book)
     17            xpointer(/co:package/co:description[1])" />
    1718
    18   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    19   href="../../final-system/common/m4.xml"
    20   xpointer="xpointer(//*[@role='package'])"/>
     19  <c:install>
    2120
    22   <sect2 role="installation">
    23     <title>Installation of M4</title>
     21    <c:para>Configure can not properly determine the results of the
     22    following tests:</c:para>
    2423
    25     <para os="cc1">Configure can not properly determine the results of the
    26     following tests:</para>
    27 
    28 <screen os="cc2"><userinput>cat &gt; config.cache &lt;&lt; EOF
     24    <c:command>cat &gt; config.cache &lt;&lt; EOF
    2925gl_cv_func_btowc_eof=yes
    3026gl_cv_func_mbrtowc_incomplete_state=yes
    … …  
    3531gl_cv_func_wcrtomb_retval=yes
    3632gl_cv_func_wctob_works=yes
    37 EOF</userinput></screen>
     33EOF</c:command>
    3834
    39     <para os="a">Prepare M4 for compilation:</para>
     35    <c:para>Prepare M4 for compilation:</c:para>
    4036
    41 <screen os="b"><userinput>./configure --prefix=/tools \
     37    <c:command c:multilib="false">./configure --prefix=/tools \
    4238    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    43     --cache-file=config.cache</userinput></screen>
     39    --cache-file=config.cache</c:command>
    4440
    45     <para os="c">Compile the package:</para>
     41    <c:command c:multilib="true">CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     42    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     43    --cache-file=config.cache</c:command>
    4644
    47 <screen os="d"><userinput>make</userinput></screen>
     45    <c:para>Compile the package:</c:para>
    4846
    49     <para os="e">Install the package:</para>
     47    <c:command>make</c:command>
    5048
    51 <screen os="f"><userinput>make install</userinput></screen>
     49    <c:para>Install the package:</c:para>
    5250
    53   </sect2>
     51    <c:command>make install</c:command>
    5452
    55   <sect2 role="content">
    56     <title/>
     53  </c:install>
    5754
    58     <para>Details on this package are located in <xref
    59     linkend="contents-m4" role="."/></para>
     55  <c:contents c:ref="ch-system-m4" />
    6056
    61   </sect2>
    62 
    63 </sect1>
     57</c:package>

  • BOOK/temp-system/mips64-64-chapter.xml

    rd240b159 r1c9985f  
    3535  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
    3636  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
    37   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
     37  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
    3838  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
    3939  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>

  • BOOK/temp-system/mips64-chapter.xml

    rd240b159 r1c9985f  
    3535  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
    3636  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
    37   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
     37  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
    3838  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
    3939  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>

  • BOOK/temp-system/ppc64-chapter.xml

    rd240b159 r1c9985f  
    3434  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
    3535  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
    36   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
     36  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
    3737  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
    3838  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>

  • BOOK/temp-system/sparc64-64-chapter.xml

    rd240b159 r1c9985f  
    3535  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
    3636  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
    37   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
     37  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
    3838  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
    3939  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>

  • BOOK/temp-system/sparc64-chapter.xml

    rd240b159 r1c9985f  
    3535  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
    3636  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
    37   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
     37  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
    3838  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
    3939  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>

  • BOOK/temp-system/x86_64-64-chapter.xml

    rd240b159 r1c9985f  
    3535  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
    3636  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
    37   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
     37  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
    3838  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
    3939  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>

  • BOOK/temp-system/x86_64-chapter.xml

    rd240b159 r1c9985f  
    3535  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
    3636  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
    37   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/m4.xml"/>
     37  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
    3838  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
    3939  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
Note: See TracChangeset for help on using the changeset viewer.