Changeset 8f9c757e


Ignore:
Timestamp:
10/17/2010 05:55:40 PM (14 years ago)
Author:
DJ Lucas <dj@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
88ccfed
Parents:
ab7b9fc
Message:

Revert last commit...wrong update.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@8643 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
22 edited

Legend:

Unmodified
Added
Removed

  • basicnet/netlibs/libsoup.xml

    rab7b9fc r8f9c757e  
    6868    <xref linkend="libgnome-keyring"/>,
    6969    <xref linkend="libproxy"/>, and
    70     <xref linkend="sqlite"/>  or <xref linkend="db"/>
    71     (with <application>SQLite3</application> compatibility)
    72     (The latter three are required if building
    73     <application>GNOME</application>)</para>
     70    <xref linkend="sqlite"/> (The latter three are required if building <application>GNOME</application>)</para>
    7471
    7572    <bridgehead renderas="sect4">Optional</bridgehead>

  • basicnet/netprogs/subversion.xml

    rab7b9fc r8f9c757e  
    8181
    8282    <bridgehead renderas="sect4">Required</bridgehead>
    83     <para role="required"><xref linkend="sqlite"/> or <xref linkend="db"/>
    84     (with <application>SQLite3</application> compatibility), and
     83    <para role="required"><xref linkend="sqlite"/>, and
    8584    <xref linkend="apache"/> (for the
    8685    <application>APR</application> only) or

  • general.ent

    rab7b9fc r8f9c757e  
    491491<!-- Chapter 23 -->
    492492
    493 <!ENTITY db-version                   "5.1.19">
     493<!ENTITY db-version                   "4.8.26">
    494494<!ENTITY mysql-version                "5.1.49">
    495495<!ENTITY postgresql-version           "8.3.10">

  • general/prog/php.xml

    rab7b9fc r8f9c757e  
    122122    <xref linkend="postgresql"/>,
    123123    <xref linkend="unixodbc"/>,
    124     <xref linkend="sqlite"/> or <xref linkend="db"/>
    125     (with <application>SQLite3</application> compatibility),
     124    <xref linkend="sqlite"/>,
    126125    <ulink url="http://qdbm.sourceforge.net/">QDBM</ulink>,
    127126    <ulink url="http://cr.yp.to/cdb.html">cdb</ulink>,

  • general/prog/python.xml

    rab7b9fc r8f9c757e  
    109109    <xref linkend="db"/>, and
    110110    <!-- <xref linkend="gdbm"/>, and -->
    111     <xref linkend="sqlite"/> or <xref linkend="db"/>
    112     (with <application>SQLite3</application> compatibility)</para>
     111    <xref linkend="sqlite"/></para>
    113112
    114113    <para>Note that there is a circular dependency with the

  • gnome/add/evolution-data-server.xml

    rab7b9fc r8f9c757e  
    7171    <xref linkend="libsoup"/>,
    7272    <xref linkend="nss"/>, and
    73     <xref linkend="sqlite"/> or <xref linkend="db"/>
    74     (with <application>SQLite3</application> compatibility)</para>
     73    <xref linkend="sqlite"/></para>
    7574
    7675    <bridgehead renderas="sect4">Recommended</bridgehead>

  • gnome/add/hamster-applet.xml

    rab7b9fc r8f9c757e  
    6262    <bridgehead renderas="sect4">Required</bridgehead>
    6363    <para role="required"><xref linkend="python"/> with <xref linkend="sqlite"/>
    64     or <xref linkend="db"/>
    65     (with <application>SQLite3</application> compatibility),
    6664    and <xref linkend="gnome-python-desktop"/> (gnomeapplet module only)</para>
    6765

  • introduction/welcome/changelog.xml

    rab7b9fc r8f9c757e  
    6969          <para>[dj] - Updated to Xorg 7.5-3 release packages.</para>
    7070        </listitem>
    71         <listitem>
    72           <para>[dj] - Updated to Berkely DB 5.1.19.</para>
    73         </listitem>
    7471      </itemizedlist>
    7572    </listitem>

  • multimedia/audioutils/amarok.xml

    rab7b9fc r8f9c757e  
    7373    <xref linkend="k3b"/> (for cd-burning support),
    7474    <xref linkend="sdl"/>,
    75     <xref linkend="sqlite"/> or <xref linkend="db"/>
    76     (with <application>SQLite3</application> compatibility),
     75    <xref linkend="sqlite"/>,
    7776    <xref linkend="postgresql"/>,
    7877    <xref linkend="mysql"/>,

  • postlfs/security/cyrus-sasl.xml

    rab7b9fc r8f9c757e  
    7373    <xref linkend="postgresql"/>,
    7474    <xref linkend="db"/>,
    75     <xref linkend="sqlite"/> or <xref linkend="db"/>
    76     (with <application>SQLite3</application> compatibility),
     75    <xref linkend="sqlite"/>,
    7776    <!-- <xref linkend="gdbm"/>,
    7877    <xref linkend="courier"/>,  -->

  • postlfs/security/nss.xml

    rab7b9fc r8f9c757e  
    7474
    7575    <bridgehead renderas="sect4">Recommended</bridgehead>
    76     <para role="recommended"><xref linkend="sqlite"/> or <xref linkend="db"/>
    77     (with <application>SQLite3</application> compatibility) (internal sqlite is
     76    <para role="recommended"><xref linkend="sqlite"/> (internal sqlite is
    7877    incompatable with existing or future installations)</para>
    7978

  • server/databases/db.xml

    rab7b9fc r8f9c757e  
    66
    77  <!ENTITY db-download-http "http://download-east.oracle.com/berkeley-db/db-&db-version;.tar.gz">
    8   <!ENTITY db-download-ftp  " ">
    9   <!ENTITY db-md5sum        "76fcbfeebfcd09ba0b4d96bfdf8d884d">
    10   <!ENTITY db-size          "30 MB">
    11   <!ENTITY db-buildsize     "267 MB (additional 170 MB to run parallel standard test suite with all bindings)">
    12   <!ENTITY db-time          "2.1 SBU (builds all bindings, add an additional 160 SBU to run parallel standard test suite)">
     8  <!ENTITY db-download-ftp  "&gentoo-ftp-repo;/db-&db-version;.tar.gz">
     9  <!ENTITY db-md5sum        "3476bac9ec0f3c40729c8a404151d5e3">
     10  <!ENTITY db-size          "22.8 MB">
     11  <!ENTITY db-buildsize     "250 MB (additional 100 MB to run parallel standard test suite)">
     12  <!ENTITY db-time          "1.9 SBU (builds all bindings, add an additional 145 SBU to run parallel standard test suite)">
    1313]>
    1414
    … …  
    7979
    8080    <bridgehead renderas="sect4">Optional</bridgehead>
    81     <para role="optional"><xref linkend="tcl"/>, and
    82     <xref linkend="icedtea6"/> or <xref linkend="jdk"/></para>
     81    <para role="optional"><xref linkend="tcl"/>,
     82    <xref linkend="icedtea6"/> or <xref linkend="jdk"/>, and
     83    <ulink url="http://www.gnu.org/software/sharutils/">sharutils</ulink>
     84    (for the <command>uudecode</command> command)</para>
    8385
    8486    <para condition="html" role="usernotes">User Notes:
    … …  
    98100    test suite.</para>
    99101
    100     <para>Build for the <application>Berkeley DB</application> test suite by
    101     running the following commands (add <parameter>--enable-java</parameter> if
    102     you wish to test the java bindings):</para>
     102    <para>Build for the <application>Berkeley DB</application> test by running
     103    the following commands:</para>
    103104
    104105<screen><userinput>cd build_unix &amp;&amp;
    105 uudecode="no" ../dist/configure --prefix=/usr \
     106../dist/configure --prefix=/usr \
    106107                  --enable-test \
    107108                  --enable-tcl  \
    108                   --enable-sql  \
    109109                  --with-tcl=/usr/lib &amp;&amp;
    110110make</userinput></screen>
    111111
    112     <para>To test <application>Berkeley DB</application>, issue the following
    113     command:</para>
    114 
    115 <screen><userinput>echo "source ../test/tcl/test.tcl; run_parallel 5 run_std; exit;" | tclsh</userinput></screen>
     112    <para>To test the results, start <command>tclsh</command>:</para>
     113
     114<screen><userinput>tclsh</userinput></screen>
     115
     116    <para>From the <command>tclsh</command> prompt (<prompt>%&nbsp;</prompt>),
     117    run:</para>
     118
     119<screen><userinput>source ../test/test.tcl
     120run_parallel 5 run_std
     121exit</userinput></screen>
    116122
    117123    <para>Clean up the source tree with the following command:</para>
    … …  
    130136    script, you'll end up with exactly what you already have. The additional
    131137    parameters you can use are listed in the Command Explanations section
    132     below.</para>
     138    below.</para> -->
    133139
    134140    <note>
    … …  
    141147      fail (unless you run the modified <command>./configure</command> command
    142148      shown below). You can run two commands (<command>javac -version</command>
    143       and <command>uudecode - -version</command>) to determine what versions are
     149      and <command>uudecode --version</command>) to determine what versions are
    144150      installed. You can also download and run a shell script from
    145151      <ulink url="&files-anduin;/jdk-uudecode-check.sh"/> that will alert
    146152      you to a non-working condition. If the identified programs exist on the
    147153      system, you must modify the
    148       <command>./configure</command> command as shown below.</para> 
    149 
    150 <screen><userinput>uudecode="no" ../dist/configure - -(use the parameters shown below)</userinput></screen>
    151     </note> -->
     154      <command>./configure</command> command as shown below.</para>
     155
     156<screen><userinput>uudecode="no" ../dist/configure --(use the parameters shown below)</userinput></screen>
     157    </note>
    152158
    153159    <para>Install <application>Berkeley DB</application> by running the
    … …  
    155161
    156162<screen><userinput>cd build_unix &amp;&amp;
    157 uudecode="no" ../dist/configure --prefix=/usr \
     163../dist/configure --prefix=/usr \
    158164                  --enable-compat185 \
    159                   --enable-cxx \
    160                   --enable-sql &amp;&amp;
     165                  --enable-cxx &amp;&amp;
    161166make</userinput></screen>
    162167
    … …  
    164169
    165170<screen role="root"><userinput>make docdir=/usr/share/doc/db-&db-version; install &amp;&amp;
    166 touch /usr/include/sqlite.h
    167171chown -v -R root:root \
     172      /usr/bin/berkeley_db_svc \
    168173      /usr/bin/db_* \
    169       /usr/bin/dbsql \
    170       /usr/include/db{,_185,_cxx,sql}.h \
    171       /usr/lib/libdb{,_cxx,_sql}{.a,.so,-5.so,-5.1.{a,la,so}} \
     174      /usr/include/db{,_185,_cxx}.h \
     175      /usr/lib/libdb{{,_cxx}.a,{,_cxx,_java,_tcl}-4.8.{so,a,la}} \
    172176      /usr/share/doc/db-&db-version;</userinput></screen>
    173 
    174     <para>If you compiled <application>Berkeley DB</application> with
    175     <application>TCL</application> support, complete the
    176     <application>TCL</application> installation with the following commands
    177     while still the <systemitem class="username">root</systemitem> user:</para>
    178 
    179 <screen role="root"><userinput>chown -v root:root \
    180       /usr/lib/libdb_tcl{.a,.so,-5.so,-5.1.{a,la,so}}</userinput></screen>
    181 
    182     <para>If you compiled <application>Berkeley DB</application> with
    183     <application>Java</application> support, complete the
    184     <application>Java</application> installation with the following commands
    185     while still the <systemitem class="username">root</systemitem> user:</para>
    186 
    187 <screen role="root"><userinput>chown -v root:root \
    188       /usr/lib/libdb_java{.so,-5.so,-5.1{.a,.la,.so,_g.so}} \
    189       /usr/lib/db.jar</userinput></screen>
    190 
    191     <para>Finaly, if you've configured <application>Berkeley DB</application>
    192     with the <parameter>--enable-sql_compat</parameter> parameter to provide
    193     <application>SQLite3</application> compatibility, complete the installation
    194     with the following commands while still the
    195     <systemitem class="username">root</systemitem> user:</para>
    196 
    197 <screen role="root"><userinput>touch /usr/include/sqlite3.h &amp;&amp;
    198 chown -v root:root \
    199       /usr/bin/sqlite3 \
    200       /usr/include/sqlite3.h \
    201       /usr/lib/libsqlite3.{a,la,so}</userinput></screen>
    202177
    203178  </sect2>
    … …  
    207182
    208183    <para><command>cd build_unix &amp;&amp;
    209     uudecode="no" ../dist/configure --prefix=/usr...</command>:
     184    ../dist/configure --prefix=/usr...</command>:
    210185    This replaces the normal <command>./configure</command> command, as
    211186    <application>Berkeley DB</application> comes with various
    212     build directories for different platforms.  The additional
    213     <envar>uudecode="no"</envar> environment variable ensures that
    214     the build will complete if <xref linkend="gmime"/> is intsalled.</para>
     187    build directories for different platforms.</para>
    215188
    216189    <para><parameter>--enable-compat185</parameter>: This switch enables
    … …  
    227200    <application>Java</application> support in DB and creates the
    228201    <filename class='libraryfile'>libdb_java</filename> libraries.</para>
    229 
    230     <para><parameter>--enable-sql</parameter>: Enables SQL support in
    231     DB and creates the <filename class='libraryfile'>libdb_sql</filename>
    232     libraries.</para>
    233 
    234     <para><parameter>--enable-sql_compat</parameter>: enables building of the
    235     <application>SQLite3</application> compatible binaries and libs.</para>
    236202
    237203    <para><command>make docdir=/usr/share/doc/db-&db-version;
    … …  
    240206    <filename class='directory'>/usr/docs</filename>.</para>
    241207
    242     <para><command>chown -v -R root:root ...</command>:These commands change
     208    <para><command>chown -v -R root:root ...</command>:This command changes
    243209    the ownership of various installed files from the uid:gid of the
    244210    builder to root:root.</para>
    245 
    246     <para><command>touch /usr/include/sqlite3.h</command>: This command updates
    247     the timestamp of the installed sqlite3 header.</para>
    248211
    249212  </sect2>
    … …  
    264227      <seglistitem>
    265228        <seg>db_archive, db_checkpoint, db_deadlock, db_dump,
    266         db_load, db_printlog, db_recover, db_stat, db_upgrade, db_verify,
    267         dbsql, sqlite3</seg>
    268         <seg>libdb.{so,a}, libdb_cxx.{so,a}, libdb_java{_g.so,.{so,a},
    269         libdb_tcl.{so,a}, libdb_sql.{so.a} and db.jar</seg>
     229        db_load, db_printlog, db_recover, db_stat, db_upgrade, db_verify</seg>
     230        <seg>libdb.{so,a}, libdb_cxx.{so,a}, libdb_java.{so,a},
     231        libdb_tcl.{so,a} and db.jar</seg>
    270232        <seg>/usr/share/doc/db-&db-version;</seg>
    271233      </seglistitem>
    … …  
    384346      </varlistentry>
    385347
    386       <varlistentry id="dbsql">
    387         <term><command>dbsql</command></term>
    388         <listitem>
    389           <para>is a terminal-based front-end to the dbsql library that can
    390           evaluate queries interactively and display the results.</para>
    391           <indexterm zone="db dbsql">
    392             <primary sortas="b-dbsql">dbsql</primary>
    393           </indexterm>
    394         </listitem>
    395       </varlistentry>
    396 
    397       <varlistentry id="db_sqlite3">
    398         <term><command>sqlite3</command></term>
    399         <listitem>
    400           <para>is a SQLite3 compatable inteface for dbsql.</para>
    401           <indexterm zone="db sqlite3">
    402             <primary sortas="b-sqlite3">sqlite3</primary>
    403           </indexterm>
    404         </listitem>
    405       </varlistentry>
    406 
    407348    </variablelist>
    408349

  • server/mail/exim.xml

    rab7b9fc r8f9c757e  
    9393    <xref linkend="mysql"/>,
    9494    <xref linkend="postgresql"/>,
    95     <xref linkend="sqlite"/> or <xref linkend="db"/>
    96     (with <application>SQLite3</application> compatibility),
     95    <xref linkend="sqlite"/>,
    9796    <xref linkend="tcpwrappers"/>, and
    9897    <xref linkend="linux-pam"/></para>

  • server/major/apache.xml

    rab7b9fc r8f9c757e  
    8585    <xref linkend="unixodbc"/>,
    8686    <xref linkend="postgresql"/>, and
    87     <xref linkend="sqlite"/> or <xref linkend="db"/>
    88     (with <application>SQLite3</application> compatibility)</para>
     87    <xref linkend="sqlite"/></para>
    8988
    9089    <para>Though you can install APR and APR-util as separate components,

  • server/major/samba3.xml

    rab7b9fc r8f9c757e  
    9393    <bridgehead renderas="sect4">Optional for Samba4 Support</bridgehead>
    9494    <para role="optional"><xref linkend="gnutls"/> (recommended) and
    95     <xref linkend="sqlite"/> or <xref linkend="db"/>
    96     (with <application>SQLite3</application> compatibility)</para>
     95    <xref linkend="sqlite"/></para>
    9796
    9897    <para condition="html" role="usernotes">User Notes:

  • x/lib/qt.xml

    rab7b9fc r8f9c757e  
    8181    <xref linkend="postgresql"/>,
    8282    <xref linkend="unixodbc"/>,
    83     <xref linkend="sqlite"/> or <xref linkend="db"/>
    84     (with <application>SQLite3</application> compatibility), and
     83    <xref linkend="sqlite"/>, and
    8584    <ulink url="http://firebird.sourceforge.net/">Firebird</ulink></para>
    8685

  • x/lib/qt4.xml

    rab7b9fc r8f9c757e  
    7979      <xref linkend="postgresql"/>,
    8080      <xref linkend="unixodbc"/>, and
    81       <xref linkend="sqlite"/> or <xref linkend="db"/>
    82       (with <application>SQLite3</application> compatibility)
     81      <xref linkend="sqlite"/>
    8382    </para>
    8483

  • x/lib/webkitgtk.xml

    rab7b9fc r8f9c757e  
    7070    <xref linkend="libxslt"/>,
    7171    <xref linkend="pcre"/>,
    72     <xref linkend="sqlite"/> or <xref linkend="db"/>
    73     (with <application>SQLite3</application> compatibility), and
     72    <xref linkend="sqlite"/>, and
    7473    <xref linkend="which"/></para>
    7574

  • x/lib/xulrunner.xml

    rab7b9fc r8f9c757e  
    101101
    102102    <bridgehead renderas="sect4">Recommended</bridgehead>
    103     <para role="recommended"><xref linkend="sqlite"/> or <xref linkend="db"/>
    104     (with <application>SQLite3</application> compatibility) (internal sqlite is
     103    <para role="recommended"><xref linkend="sqlite"/> (internal sqlite is
    105104    incompatable with existing or future installations)</para>
    106105

  • xsoft/graphweb/firefox.xml

    rab7b9fc r8f9c757e  
    123123    <xref linkend="nss"/>,
    124124    <xref linkend="startup-notification"/>.
    125     <xref linkend="sqlite"/> or <xref linkend="db"/>
    126     (with <application>SQLite3</application> compatibility),
     125    <xref linkend="sqlite"/>,
    127126    <xref linkend="unzip"/>,
    128127    <ulink url="http://www.valgrind.org/">Valgrind</ulink> (only for testing the

  • xsoft/other/balsa.xml

    rab7b9fc r8f9c757e  
    8080    <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
    8181    <xref linkend="libnotify"/>,
    82     <xref linkend="sqlite"/> or <xref linkend="db"/>
    83     (with <application>SQLite3</application> compatibility), and
     82    <xref linkend="sqlite"/>, and
    8483    an <xref linkend="server-mail"/> (that provides a
    8584    <command>sendmail</command> command, note that it is only used if you

  • xsoft/other/pidgin.xml

    rab7b9fc r8f9c757e  
    9797    <xref linkend="evolution-data-server"/>
    9898      (required for Evolution integration),
    99     <xref linkend="sqlite"/>  or <xref linkend="db"/>
    100       (with <application>SQLite3</application> compatibility)
     99    <xref linkend="sqlite"/>
    101100      (required for the Contact Availability Prediction plugin),
    102101    <xref linkend="cyrus-sasl"/>
Note: See TracChangeset for help on using the changeset viewer.