Author: krejzi Date: 2013-01-18 08:06:25 -0700 (Fri, 18 Jan 2013) New Revision: 10946
Modified: trunk/BOOK/general.ent trunk/BOOK/general/genutils/graphviz.xml trunk/BOOK/general/prog/python2.xml trunk/BOOK/general/prog/python3.xml trunk/BOOK/general/prog/ruby.xml trunk/BOOK/general/prog/tcl.xml trunk/BOOK/general/prog/tk.xml trunk/BOOK/introduction/welcome/changelog.xml trunk/BOOK/server/databases/sqlite.xml Log: Package updates and some modifications. See changelog.xml for details. Modified: trunk/BOOK/general/genutils/graphviz.xml =================================================================== --- trunk/BOOK/general/genutils/graphviz.xml 2013-01-18 02:31:19 UTC (rev 10945) +++ trunk/BOOK/general/genutils/graphviz.xml 2013-01-18 15:06:25 UTC (rev 10946) @@ -6,9 +6,9 @@ <!ENTITY graphviz-download-http "http://graphviz.org/pub/graphviz/stable/SOURCES/graphviz-&graphviz-version;.tar.gz";> <!ENTITY graphviz-download-ftp " "> - <!ENTITY graphviz-md5sum "8d26c1171f30ca3b1dc1b429f7937e58"> - <!ENTITY graphviz-size "19 MB"> - <!ENTITY graphviz-buildsize "155 MB"> + <!ENTITY graphviz-md5sum "967ad0a3d2bf164082e076c4416ede95"> + <!ENTITY graphviz-size "23 MB"> + <!ENTITY graphviz-buildsize "195 MB"> <!ENTITY graphviz-time "2.5 SBU"> ]> @@ -74,16 +74,6 @@ </listitem> </itemizedlist> - <bridgehead renderas="sect3">Additional Downloads</bridgehead> - <itemizedlist spacing="compact"> - <listitem> - <para> - Required patch: - <ulink url="&patch-root;/graphviz-&graphviz-version;-fix-guile-detection-1.patch"/> - </para> - </listitem> - </itemizedlist> - <bridgehead renderas="sect3">Graphviz Dependencies</bridgehead> <bridgehead renderas="sect4">Recommended</bridgehead> @@ -122,7 +112,7 @@ <ulink url="http://www.iolanguage.com/about/";>Io</ulink>, <ulink url="http://www.lua.org/";>Lua</ulink>, <ulink url="http://www.mono-project.com/Main_Page";>Mono</ulink>, - <ulink url="http://caml.inria.fr/ocaml/index.en.html";>Objective Caml</ulink>, + <ulink url="http://ocaml.org/";>OCaml</ulink>, <xref linkend="php"/>, <xref linkend="python2"/>, <ulink url="http://www.r-project.org/";>R</ulink>, @@ -132,8 +122,8 @@ </para> <para condition="html" role="usernotes">User Notes: - <ulink url="&blfs-wiki;/graphviz"/></para> - + <ulink url="&blfs-wiki;/graphviz"/> + </para> </sect2> <sect2 role="installation"> @@ -144,11 +134,8 @@ commands: </para> -<screen><userinput>patch -Np1 -i ../graphviz-&graphviz-version;-fix-guile-detection-1.patch && -sed -e '/"archdir"/s:$:+" '"$(echo -I/usr/include/ruby-1.9.1/{`uname -m`-linux,ruby/backward,})"'":' \ - -e '/CONFIG/s:site:vendor:' \ - -i config/config_ruby.rb && -./configure --prefix=/usr CXXFLAGS="-fpermissive" && +<screen><userinput>sed -e "s/\"guile >=/\"guile-2.0 >=/g" -i configure && +./configure --prefix=/usr --disable-static CXXFLAGS="-fpermissive" && make</userinput></screen> <para> @@ -164,7 +151,7 @@ <para> If desired, create a symbolic link in the system documents directory to the documentation installed in - <filename class='directory'>/usr/share/graphviz/doc</filename> using the + <filename class="directory">/usr/share/graphviz/doc</filename> using the following command as the <systemitem class="username">root</systemitem> user: </para> @@ -174,6 +161,20 @@ </sect2> + <sect2 role="commands"> + <title>Command Explanations</title> + + <para> + <command>sed -e "s/\"guile >=/\"guile-2.0 >=/g" -i configure</command>: + This sed fixes detection of the <application>Guile</application> + library. + </para> + + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; + href="../../xincludes/static-libraries.xml"/> + + </sect2> + <sect2 role="configuration"> <title>Configuring Graphviz</title> @@ -199,7 +200,7 @@ <command>dot -c</command> (as the <systemitem class="username">root</systemitem> user) to update the <filename>config</filename> file in - <filename class='directory'>/usr/lib/graphviz</filename>. + <filename class="directory">/usr/lib/graphviz</filename>. </para> </sect3> @@ -229,7 +230,8 @@ <seg> /usr/include/graphviz, /usr/lib/graphviz and - /usr/share/graphviz</seg> + /usr/share/graphviz + </seg> </seglistitem> </segmentedlist> Modified: trunk/BOOK/general/prog/python2.xml =================================================================== --- trunk/BOOK/general/prog/python2.xml 2013-01-18 02:31:19 UTC (rev 10945) +++ trunk/BOOK/general/prog/python2.xml 2013-01-18 15:06:25 UTC (rev 10946) @@ -5,15 +5,15 @@ %general-entities; <!ENTITY python2-download-http - "http://www.python.org/ftp/python/&python2-version;/Python-&python2-version;.tar.xz";> + "http://www.python.org/ftp/python/&python2-version;/Python-&python2-version;.tar.xz";> <!ENTITY python2-download-ftp " "> - <!-- <!ENTITY python2-download-ftp "&gentoo-ftp-repo;/Python-&python2-version;.tar.xz"> --> <!ENTITY python2-md5sum "62c4c1699170078c469f79ddfed21bc0"> <!ENTITY python2-size "9.6 MB"> <!ENTITY python2-buildsize "235 MB (not including the test suite)"> <!ENTITY python2-time "1.1 SBU (not including the test suite)"> + <!ENTITY python2htmldoc-download-http - "http://docs.python.org/ftp/python/doc/&python2-version;/python-&python2-version;-docs-html.tar.bz2";> + "http://docs.python.org/ftp/python/doc/&python2-version;/python-&python2-version;-docs-html.tar.bz2";> <!ENTITY python2htmldoc-md5sum "101c13d39f76fd6706aac3a9196b2f01"> <!ENTITY python2htmldoc-size "4.2 MB"> ]> @@ -29,7 +29,7 @@ <title>Python-&python2-version;</title> <indexterm zone="python2"> - <primary sortas="a-Python2">Python</primary> + <primary sortas="a-Python2">Python2</primary> </indexterm> <sect2 role="package"> @@ -37,7 +37,7 @@ <para> The <application>Python 2</application> package contains the - <application>Python</application> development environment. This is useful + <application>Python</application> development environment. It is useful for object-oriented programming, writing scripts, prototyping large programs or developing entire applications. This version is for backward compatibility with other dependent packages. @@ -100,30 +100,37 @@ </listitem> </itemizedlist> + <bridgehead renderas="sect3">Additional Patches</bridgehead> + <itemizedlist spacing="compact"> + <listitem> + <para> + Required patch: + <ulink url="&patch-root;/Python-&python2-version;-bsddb_fix-1.patch"/> + </para> + </listitem> + </itemizedlist> + <bridgehead renderas="sect3">Python Dependencies</bridgehead> + <bridgehead renderas="sect4">Recommended</bridgehead> + <para role="recommended"> + <xref linkend="expat"/>, + <xref linkend="libffi"/> and + <xref linkend="pkgconfig"/> + </para> + <bridgehead renderas="sect4">Optional</bridgehead> <para role="optional"> - <!-- <xref linkend="pth"/> can only be used if you've overwritten glibc's - libpthread. --> - <xref linkend="libffi"/> and <xref linkend="pkgconfig"/> - (<command>configure</command> uses <command>pkgconfig</command> to find - <application>libffi</application>. There is a circular dependency here: - <application>Pkgconfig</application> requires - <application>Glib</application> which requires - <application>Python 2</application>), - <!-- gcc's libffi does not install a pkgconfig file --> - <ulink url="http://sphinx.pocoo.org/";>Sphinx</ulink> (to create the docs), - <xref linkend="bluez"/>, + <xref linkend="bluez"/> and + <ulink url="http://sphinx.pocoo.org/";>Sphinx</ulink> + </para> + + <bridgehead renderas="sect4">Optional (For Additional Modules)</bridgehead> + <para role="optional"> + <xref linkend="db"/>, <xref linkend="openssl"/>, - <xref linkend="tk"/> (there is a circular dependency with the - <application>Tk</application> package as it requires Xorg to be installed - but parts of Xorg depend on <application>Python</application>), - <!--<xref linkend="db"/> and--> - <ulink - url="http://www.oracle.com/technetwork/products/berkeleydb/downloads/";>BerkeleyDB</ulink> - (only versions up to 4.8), and - <xref linkend="sqlite"/>. + <xref linkend="sqlite"/> and + <xref linkend="tk"/> </para> <para condition="html" role="usernotes"> @@ -140,7 +147,12 @@ </para> <screen><userinput>sed -i "s/ndbm_libs = \[\]/ndbm_libs = ['gdbm', 'gdbm_compat']/" setup.py && -./configure --prefix=/usr --enable-shared && +patch -Np1 -i ../Python-&python2-version;-bsddb_fix-1.patch && +./configure --prefix=/usr \ + --enable-shared \ + --with-system-expat \ + --with-system-ffi \ + --enable-unicode=ucs4 && make</userinput></screen> <para> @@ -193,25 +205,40 @@ <title>Command Explanations</title> <para> - <option>--with-system-ffi</option>: If you have installed - <application>Libffi</application> and - <application>Pkgconfig</application>, add this option to compile - <application>Python</application>'s _ctypes module using the system - installed <application>Libffi</application>. Otherwise - <application>Python</application> will compile its own copy of - <application>Libffi</application>. - </para> - - <para> <command>sed -i "s/ndbm_libs = ..." setup.py</command>: This command is used to fix a build problem with the <application>GDBM</application> library. </para> <para> + <option>--with-system-expat</option>: This switch enables linking against + system version of <application>Expat</application>. Remove if you have + not installed recommended dependency <xref linkend="expat"/>. + </para> + + <para> + <option>--with-system-ffi</option>: This switch enables linking against + system version of <application>libffi</application>. Remove if you have + not installed recommended dependency <xref linkend="libffi"/>. + </para> + + <para> + <parameter>--enable-unicode=ucs4</parameter>: This switch enables + 32bit Unicode support in <application>Python</application>. + </para> + + <para> + <parameter>--with-dbmliborder=bdb:gdbm:ndbm</parameter>: Use this switch + if you want to build <application>Python</application> DBM Module + against <application>Berkeley DB</application> instead of + <application>GDBM</application>. + </para> + + <para> <command>chmod ...</command>: Fix permissions for libraries to be consistent with other libraries. </para> + </sect2> <sect2 role="configuration"> @@ -224,6 +251,7 @@ </para> <screen role="root"><userinput>export PYTHONDOCS=/usr/share/doc/Python-&python2-version;</userinput></screen> + </sect2> <sect2 role="content"> @@ -333,6 +361,9 @@ </indexterm> </listitem> </varlistentry> + </variablelist> + </sect2> + </sect1> Modified: trunk/BOOK/general/prog/python3.xml =================================================================== --- trunk/BOOK/general/prog/python3.xml 2013-01-18 02:31:19 UTC (rev 10945) +++ trunk/BOOK/general/prog/python3.xml 2013-01-18 15:06:25 UTC (rev 10946) @@ -11,6 +11,7 @@ <!ENTITY python3-size "11.2 MB"> <!ENTITY python3-buildsize "141 MB (additional 32 MB for the test suite)"> <!ENTITY python3-time "1.2 SBU (additional 2.2 SBU to run the test suite)"> + <!ENTITY python3htmldoc-download-http "http://docs.python.org/ftp/python/doc/&python3-version;/python-&python3-version;-docs-html.tar.bz2";> <!ENTITY python3htmldoc-md5sum "d8de7264eb5b03b54044825b765324c7"> @@ -101,8 +102,9 @@ <bridgehead renderas="sect4">Recommended</bridgehead> <para role="recommended"> - <xref linkend="expat"/> and - <xref linkend="libffi"/> + <xref linkend="expat"/>, + <xref linkend="libffi"/> and + <xref linkend="pkgconfig"/> </para> <bridgehead renderas="sect4">Optional</bridgehead> @@ -112,7 +114,7 @@ <bridgehead renderas="sect4">Optional (For Additional Modules)</bridgehead> <para role="optional"> - <xref linkend="db"/> + <xref linkend="db"/>, <xref linkend="openssl"/>, <xref linkend="sqlite"/> and <xref linkend="tk"/> @@ -149,7 +151,7 @@ Now, as the <systemitem class="username">root</systemitem> user: </para> -<screen role="root"><userinput>make install && +<screen role="root"><userinput>make install && chmod -v 755 /usr/lib/libpython&python3-majorver;m.so && chmod -v 755 /usr/lib/libpython3.so</userinput></screen> @@ -188,7 +190,7 @@ </para> <para> - <option>--with-sytem-expat</option>: This switch enables linking against + <option>--with-system-expat</option>: This switch enables linking against system version of <application>Expat</application>. Remove if you have not installed recommended dependency <xref linkend="expat"/>. </para> @@ -200,6 +202,13 @@ </para> <para> + <parameter>--with-dbmliborder=bdb:gdbm:ndbm</parameter>: Use this switch + if you want to build <application>Python</application> DBM Module + against <application>Berkeley DB</application> instead of + <application>GDBM</application>. + </para> + + <para> <command>chmod ...</command>: Fix permissions for shared libraries to be consistent with other libraries. </para> Modified: trunk/BOOK/general/prog/ruby.xml =================================================================== --- trunk/BOOK/general/prog/ruby.xml 2013-01-18 02:31:19 UTC (rev 10945) +++ trunk/BOOK/general/prog/ruby.xml 2013-01-18 15:06:25 UTC (rev 10946) @@ -6,7 +6,7 @@ <!ENTITY ruby-download-http " "> <!ENTITY ruby-download-ftp "ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-&ruby-version;.tar.bz2";> - <!ENTITY ruby-md5sum "13c26ea368d88a560f07cc8c5eb4fa05"> + <!ENTITY ruby-md5sum "944e73eba9ee9e1f2647ff32ec0b14b2"> <!ENTITY ruby-size "9.6 MB"> <!ENTITY ruby-buildsize "350 MB"> <!ENTITY ruby-time "4.0 SBU"> @@ -75,9 +75,9 @@ <bridgehead renderas="sect4">Optional</bridgehead> <para role="optional"> + <xref linkend="db"/>, <xref linkend="doxygen"/>, <xref linkend="graphviz"/>, - <ulink url="http://pyyaml.org/wiki/LibYAML";>libyaml</ulink>, <xref linkend="openssl"/> and <xref linkend="tk"/> </para> @@ -95,9 +95,7 @@ commands: </para> -<screen><userinput>./configure --prefix=/usr \ - --enable-shared \ - --enable-pthread && +<screen><userinput>./configure --prefix=/usr --enable-shared && make</userinput></screen> <para> @@ -120,11 +118,6 @@ the <filename class="libraryfile">libruby</filename> shared library. </para> - <para> - <option>--enable-pthread</option>: This switch enables linking of the - threading library into the <application>Ruby</application> build. - </para> - </sect2> <sect2 role="content"> Modified: trunk/BOOK/general/prog/tcl.xml =================================================================== --- trunk/BOOK/general/prog/tcl.xml 2013-01-18 02:31:19 UTC (rev 10945) +++ trunk/BOOK/general/prog/tcl.xml 2013-01-18 15:06:25 UTC (rev 10946) @@ -6,19 +6,17 @@ <!ENTITY tcl-download-http "&sourceforge-repo;/tcl/tcl&tcl-version;-src.tar.gz"> <!ENTITY tcl-download-ftp " "> - <!-- this might appear in the future - <!ENTITY tcl-download-ftp "&gentoo-ftp-repo;/tcl&tcl-version;-src.tar.gz">--> - <!ENTITY tcl-md5sum "174b2b4c619ba8f96875d8a051917703"> - <!ENTITY tcl-size "4.3 MB"> - <!ENTITY tcl-buildsize "48 MB (includes documentation installation)"> - <!ENTITY tcl-time "0.4 SBU"> + <!ENTITY tcl-md5sum "573aa5fe678e9185ef2b3c56b24658d3"> + <!ENTITY tcl-size "8.3 MB"> + <!ENTITY tcl-buildsize "80 MB (includes documentation installation)"> + <!ENTITY tcl-time "0.5 SBU"> <!ENTITY tcl-doc-download "&sourceforge-repo;/tcl/tcl&tcl-version;-html.tar.gz"> - <!ENTITY tcl-doc-md5sum "849785419423b00d0d3d771239a01299"> + <!ENTITY tcl-doc-md5sum "e53baf609df8b55f091c258886b6f994"> <!ENTITY tcl-doc-size "913 KB"> - <!-- Ensure this is updated when Tcl moves from the 8.5.x branch --> - <!ENTITY tcl-ver "8.5"> + <!-- Ensure this is updated when Tcl moves from the 8.6.x branch --> + <!ENTITY tcl-ver "8.6"> ]> <sect1 id="tcl" xreflabel="Tcl-&tcl-version;"> @@ -100,8 +98,8 @@ </itemizedlist> <para condition="html" role="usernotes">User Notes: - <ulink url="&blfs-wiki;/tcl"/></para> - + <ulink url="&blfs-wiki;/tcl"/> + </para> </sect2> <sect2 role="installation"> @@ -127,8 +125,8 @@ <screen><userinput>cd unix && ./configure --prefix=/usr \ - --enable-threads \ - --mandir=/usr/share/man && + --mandir=/usr/share/man \ + $([ $(uname -m) = x86_64 ] && echo --enable-64bit) && make && sed -e "s@^\(TCL_SRC_DIR='\).*@\1/usr/include'@" \ @@ -163,8 +161,10 @@ <title>Command Explanations</title> <para> - <option>--enable-threads</option>: This switch forces the package - to build with threads support. + <option>$([ $(uname -m) = x86_64 ] && echo + --enable-64bit)</option>: This switch is used to enable 64 bit + support in <application>Tcl</application> on 64 bit operating + systems. </para> <para> @@ -208,8 +208,15 @@ </seg> <seg> /usr/lib/tcl8, + /usr/lib/thread2.7.0, + /usr/lib/tdbcodbc1.0.0, + /usr/lib/tdbc1.0.0, + /usr/lib/sqlite3.7.15.1, + /usr/lib/tdbcpostgres1.0.0, /usr/lib/tcl&tcl-ver;, - /usr/share/man/mann and optionally + /usr/lib/tdbcmysql1.0.0, + /usr/lib/itcl4.0.0, + /usr/share/man/mann and optionaly /usr/share/doc/&tcl-version; </seg> </seglistitem> @@ -246,7 +253,7 @@ </varlistentry> <varlistentry id="libtcl"> - <term><filename role="library">libtcl&tcl-ver;.so</filename></term> + <term><filename class="libraryfile">libtcl&tcl-ver;.so</filename></term> <listitem> <para> contains the API functions required by Modified: trunk/BOOK/general/prog/tk.xml =================================================================== --- trunk/BOOK/general/prog/tk.xml 2013-01-18 02:31:19 UTC (rev 10945) +++ trunk/BOOK/general/prog/tk.xml 2013-01-18 15:06:25 UTC (rev 10946) @@ -6,15 +6,13 @@ <!ENTITY tk-download-http "&sourceforge-repo;/tcl/tk&tk-version;-src.tar.gz"> <!ENTITY tk-download-ftp " "> - <!-- might be useful again in the future - <!ENTITY tk-download-ftp "&gentoo-ftp-repo;/tk&tk-version;-src.tar.gz">--> - <!ENTITY tk-md5sum "a01640176845c1f654a412cfc9bab13b"> - <!ENTITY tk-size "3.7 MB"> - <!ENTITY tk-buildsize "28 MB"> + <!ENTITY tk-md5sum "b883a1a3c489c17413fb602a94bf54e8"> + <!ENTITY tk-size "4.1 MB"> + <!ENTITY tk-buildsize "30 MB"> <!ENTITY tk-time "0.3 SBU"> - <!-- Ensure this is updated when Tk moves from the 8.5.x branch --> - <!ENTITY tk-ver "8.5"> + <!-- Ensure this is updated when Tk moves from the 8.6.x branch --> + <!ENTITY tk-ver "8.6"> ]> <sect1 id="tk" xreflabel="Tk-&tk-version;"> @@ -84,8 +82,8 @@ </para> <para condition="html" role="usernotes">User Notes: - <ulink url="&blfs-wiki;/tk"/></para> - + <ulink url="&blfs-wiki;/tk"/> + </para> </sect2> <sect2 role="installation"> @@ -98,9 +96,11 @@ <screen><userinput>cd unix && ./configure --prefix=/usr \ - --enable-threads \ - --mandir=/usr/share/man && + --mandir=/usr/share/man \ + $([ $(uname -m) = x86_64 ] && echo --enable-64bit) && + make && + sed -e "s@^\(TK_SRC_DIR='\).*@\1/usr/include'@" \ -e "/TK_B/s@='\(-L\)\?.*unix@='\1/usr/lib@" \ -i tkConfig.sh</userinput></screen> @@ -127,8 +127,10 @@ <title>Command Explanations</title> <para> - <option>--enable-threads</option>: This switch forces the - package to build with thread support. + <option>$([ $(uname -m) = x86_64 ] && echo + --enable-64bit)</option>: This switch is used to enable 64 bit + support in <application>Tk</application> on 64 bit operating + systems. </para> <para> @@ -208,7 +210,7 @@ </varlistentry> <varlistentry id="libtk"> - <term><filename role="library">libtk&tk-ver;.so</filename></term> + <term><filename class="libraryfile">libtk&tk-ver;.so</filename></term> <listitem> <para> contains the API functions required Modified: trunk/BOOK/general.ent =================================================================== --- trunk/BOOK/general.ent 2013-01-18 02:31:19 UTC (rev 10945) +++ trunk/BOOK/general.ent 2013-01-18 15:06:25 UTC (rev 10946) @@ -329,7 +329,7 @@ <!ENTITY compface-version "1.5.2"> <!ENTITY desktop-file-utils-version "0.21"> <!ENTITY gperf-version "3.0.4"> -<!ENTITY graphviz-version "2.28.0"> +<!ENTITY graphviz-version "2.30.0"> <!ENTITY gtk-doc-version "1.18"> <!ENTITY hd2u-version "1.0.3"> <!ENTITY icon-naming-utils-version "0.8.90"> @@ -409,11 +409,11 @@ <!ENTITY pkgconfig-version "0.27.1"> <!ENTITY python2-version "2.7.3"> <!ENTITY python3-version "3.3.0"> -<!ENTITY ruby-version "1.9.3-p362"> +<!ENTITY ruby-version "1.9.3-p374"> <!ENTITY slang-version "2.2.4"> <!ENTITY subversion-version "1.7.7"> -<!ENTITY tcl-version "8.5.12"> -<!ENTITY tk-version "8.5.12"> +<!ENTITY tcl-version "8.6.0"> +<!ENTITY tk-version "8.6.0"> <!ENTITY vala-version "0.18.1"> <!ENTITY yasm-version "1.2.0"> Modified: trunk/BOOK/introduction/welcome/changelog.xml =================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml 2013-01-18 02:31:19 UTC (rev 10945) +++ trunk/BOOK/introduction/welcome/changelog.xml 2013-01-18 15:06:25 UTC (rev 10946) @@ -43,11 +43,30 @@ </listitem> --> - <listitem> <para>January 18th, 2013</para> <itemizedlist> <listitem> + <para>[krejzi] - Graphviz 2.30.0.</para> + </listitem> + <listitem> + <para>[krejzi] - Ruby 1.9.3-p374.</para> + </listitem> + <listitem> + <para>[krejzi] - Tcl 8.6.0.</para> + </listitem> + <listitem> + <para>[krejzi] - Tk 8.6.0.</para> + </listitem> + <listitem> + <para>[krejzi] - Removed Tcl extension build instructions + from SQLite page as it is now part of Tcl 8.6.0.</para> + </listitem> + <listitem> + <para>[krejzi] - Fixed Python 2 bsddb module build against + newer Berkeley DB.</para> + </listitem> + <listitem> <para>[randy] - Added DESTDIR instructions to packages that update '/usr/share/glib-2.0/schemas'.</para> </listitem> Modified: trunk/BOOK/server/databases/sqlite.xml =================================================================== --- trunk/BOOK/server/databases/sqlite.xml 2013-01-18 02:31:19 UTC (rev 10945) +++ trunk/BOOK/server/databases/sqlite.xml 2013-01-18 15:06:25 UTC (rev 10946) @@ -104,7 +104,6 @@ <bridgehead renderas="sect4">Optional</bridgehead> <para role="optional"> - <xref linkend="tcl"/> and <xref linkend="unzip"/> (required to unzip the documentation). </para> @@ -136,17 +135,6 @@ make</userinput></screen> <para> - If you have installed <xref linkend="tcl"/> and wish to build - <application>SQLite</application> <application>TCL</application> - extension, issue the following commands: - </para> - -<screen><userinput>pushd tea && -./configure --prefix=/usr && -make && -popd</userinput></screen> - - <para> This package does not come with a test suite. </para> @@ -157,14 +145,6 @@ <screen role="root"><userinput>make install</userinput></screen> <para> - If you have built <xref linkend="tcl"/> extension, install it by - running the following command as the - <systemitem class="username">root</systemitem> user: - </para> - -<screen role="root"><userinput>make -C tea install</userinput></screen> - - <para> If you downloaded the optional documentation, issue the following commands as the <systemitem class="username">root</systemitem> user to install it: </para> @@ -200,7 +180,7 @@ <segmentedlist> <segtitle>Installed Program</segtitle> <segtitle>Installed Library</segtitle> - <segtitle>Installed Directories</segtitle> + <segtitle>Installed Directory</segtitle> <seglistitem> <seg> @@ -210,7 +190,6 @@ libsqlite3.so </seg> <seg> - /usr/lib/sqlite&sqlite-version; and /usr/share/doc/sqlite-&sqlite-version; </seg> </seglistitem> -- http://linuxfromscratch.org/mailman/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
