Changeset 517ec63


Ignore:
Timestamp:
Feb 21, 2006, 1:07:38 AM (18 years ago)
Author:
Jim Gifford <clfs@…>
Children:
0ff00ec
Parents:
a21d07e
Message:

r708@server (orig r706): jim | 2005-11-14 15:26:47 -0800

r770@server: jim | 2005-11-14 15:25:06 -0800
Updates to TCL/Expect use install-private-headers. Thank you Greg Schafer


Files:
7 edited

Legend:

Unmodified
Added
Removed

  • introduction/common/changelog.xml

    ra21d07e r517ec63  
    4848          <para>[manuel] - Omit running Bzip2's testsuite as a separate step,
    4949          as make runs it automatically. Ported from LFS-SVN.</para>
     50        </listitem>
     51        <listitem>
     52          <para>[jim] - Updated TCL build to install headers. Thank you Greg Schafer.</para>
     53        </listitem>
     54        <listitem>
     55          <para>[jim] - Updated Expect to use the newly relocated TCL Headers. Thank you Greg Schafer.</para>
    5056        </listitem>
    5157      </itemizedlist>

  • temp-tools/64/expect-64bit.xml

    ra21d07e r517ec63  
    3535
    3636<screen><userinput>./configure --prefix=/tools --with-tcl=/tools/lib \
    37    --with-tclinclude=$TCLPATH --with-x=no</userinput></screen>
     37   --with-tclinclude=/tools/include --with-x=no</userinput></screen>
    3838
    3939    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    … …  
    6565    xpointer="xpointer(//*[@os='j'])"/>
    6666
    67     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    68     href="../common/expect.xml"
    69     xpointer="xpointer(//*[@os='k'])"/>
    70 
    71     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    72     href="../common/expect.xml"
    73     xpointer="xpointer(//*[@os='l'])"/>
    74 
    75     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    76     href="../common/expect.xml"
    77     xpointer="xpointer(//*[@os='m'])"/>
    78 
    7967  </sect2>
    8068

  • temp-tools/64/tcl-64bit.xml

    ra21d07e r517ec63  
    5555    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    5656    href="../common/tcl.xml"
    57     xpointer="xpointer(//*[@os='h'])"/>
    58 
    59     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    60     href="../common/tcl.xml"
    6157    xpointer="xpointer(//*[@os='i'])"/>
    6258

  • temp-tools/common/expect.xml

    ra21d07e r517ec63  
    4343
    4444<screen><userinput>./configure --prefix=/tools --with-tcl=/tools/lib \
    45    --with-tclinclude=$TCLPATH --with-x=no</userinput></screen>
     45   --with-tclinclude=/tools/include --with-x=no</userinput></screen>
    4646
    4747    <variablelist os="d">
    … …  
    5757
    5858      <varlistentry>
    59         <term><parameter>--with-tclinclude=$TCLPATH</parameter></term>
     59        <term><parameter>--with-tclinclude=/tools/include</parameter></term>
    6060        <listitem>
    61           <para>This explicitly tells Expect where to find Tcl's source
    62           directory and internal headers. Using this option avoids conditions
     61          <para>This explicitly tells Expect where to find Tcl's internal headers.
     62          Using this option avoids conditions
    6363          where <command>configure</command> fails because it cannot
    6464          automatically discover the location of the Tcl source directory.</para>
    … …  
    104104
    105105    </variablelist>
    106 
    107     <para os="k">Now remove the <envar>TCLPATH</envar> variable:</para>
    108 
    109 <screen os="l"><userinput>unset TCLPATH</userinput></screen>
    110 
    111     <para os="m">The source directories of both Tcl and Expect can now
    112     be removed.</para>
    113106
    114107  </sect2>

  • temp-tools/common/tcl.xml

    ra21d07e r517ec63  
    6666<screen os="g"><userinput>make install</userinput></screen>
    6767
    68     <warning os="h">
    69       <para><emphasis>Do not</emphasis> remove the <filename
    70       class="directory">tcl&tcl-version;</filename> source directory yet,
    71       as the next package will need its internal headers.</para>
    72     </warning>
     68    <para os="i">Now we will install the TCL headers into /tools.</para>
    7369
    74     <para os="i">Set a variable containing the full path of the current directory.
    75     The next package, Expect, will use this variable to find Tcl's headers.</para>
    76 
    77 <screen os="j"><userinput>cd ..
    78 export TCLPATH=`pwd`</userinput></screen>
     70<screen os="j"><userinput>make install-private-headers</userinput></screen>
    7971
    8072    <para os="k">Now make a necessary symbolic link:</para>

  • temp-tools/multilib/expect-64bit.xml

    ra21d07e r517ec63  
    3535
    3636<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools \
    37    --with-tcl=/tools/lib64 --with-tclinclude=$TCLPATH \
     37   --with-tcl=/tools/lib64 --with-tclinclude=/tools/include \
    3838   --libdir=/tools/lib64 --with-x=no</userinput></screen>
    3939
    … …  
    6666    xpointer="xpointer(//*[@os='j'])"/>
    6767
    68     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    69     href="../common/expect.xml"
    70     xpointer="xpointer(//*[@os='k'])"/>
    71 
    72     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    73     href="../common/expect.xml"
    74     xpointer="xpointer(//*[@os='l'])"/>
    75 
    76     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    77     href="../common/expect.xml"
    78     xpointer="xpointer(//*[@os='m'])"/>
    79 
    8068  </sect2>
    8169

  • temp-tools/multilib/tcl-64bit.xml

    ra21d07e r517ec63  
    5656    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    5757    href="../common/tcl.xml"
    58     xpointer="xpointer(//*[@os='h'])"/>
    59 
    60     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    61     href="../common/tcl.xml"
    6258    xpointer="xpointer(//*[@os='i'])"/>
    6359
Note: See TracChangeset for help on using the changeset viewer.