Changeset 5f0bab7


Ignore:
Timestamp:
04/24/2005 09:52:46 AM (18 years ago)
Author:
DJ Lucas <dj@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 6.1, 6.2, 6.2.0, 6.2.0-rc1, 6.2.0-rc2, 6.3, 6.3-rc1, 6.3-rc2, 6.3-rc3, 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, ken/inkscape-core-mods, krejzi/svn, lazarus, nosym, perl-modules, plabs/python-mods, qt5new, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226
Children:
2ae9847
Parents:
6a25deb2
Message:

update to jdk-1.5 and related fixes

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

Files:
20 edited
1 moved

Legend:

Unmodified
Added
Removed

  • basicnet/netprogs/subversion.xml

    r6a25deb2 r5f0bab7  
    6565<xref linkend="openssh"/> (runtime only),
    6666<ulink url="http://www.webdav.org/neon/">neon-&svn-neon-version;</ulink>,
    67 <xref linkend="j2sdk"/> (to build the <application>JAVA</application>
     67<xref linkend="jdk"/> (to build the <application>JAVA</application>
    6868bindings),
    6969<ulink url="http://www.junit.org/">JUnit</ulink> (for running the

  • general.ent

    r6a25deb2 r5f0bab7  
    136136<!ENTITY gcc3-version                 "3.3.4">
    137137<!ENTITY guile-version                "1.6.7">
    138 <!ENTITY j2sdk-bin-version            "1.4.2_07">
    139 <!ENTITY j2sdk-src-version            "1.4.2">
     138<!ENTITY jdk-bin-version              "1.5.0_02">
     139<!ENTITY jdk-src-version              "1.5.0">
    140140<!ENTITY librep-version               "0.17">
    141141<!ENTITY NASM-version                 "0.98.39">

  • general/genutils/pilot-link.xml

    r6a25deb2 r5f0bab7  
    5555<sect4><title>Optional</title>
    5656<para><xref linkend="libpng"/>,
    57 <xref linkend="j2sdk"/>,
     57<xref linkend="jdk"/>,
    5858<xref linkend="tcl"/>,
    5959<xref linkend="python"/> and

  • general/prog/gcc.xml

    r6a25deb2 r5f0bab7  
    175175<note><para>Some of the <application>Java</application> programs installed by
    176176the <application><acronym>GCC</acronym></application> package conflict (have
    177 the same names) with programs from the <xref linkend="j2sdk"/> package. If
     177the same names) with programs from the <xref linkend="jdk"/> package. If
    178178you're installing the <application>Java</application> language from the
    179179<application><acronym>GCC</acronym></application> package but you wish to
    180 use the programs from the <application>J2SDK</application> as the defaults,
     180use the programs from the <application>JDK</application> as the defaults,
    181181ensure <filename class='directory'>$JAVA_HOME/bin</filename> is listed before
    182182<filename class='directory'>/usr/bin</filename> in your <envar>PATH</envar>

  • general/prog/jdk.xml

    r6a25deb2 r5f0bab7  
    55  %general-entities;
    66
    7   <!ENTITY j2sdk-download-source "http://www.sun.com/software/communitysource/j2se/java2/download.html">
    8   <!ENTITY j2sdk-download-binary "http://java.sun.com/j2se/1.4.2/download.html">
    9   <!ENTITY j2sdk-source-md5sum   "http://anduin.linuxfromscratch.org/sources/BLFS/SVN/I-K/j2sdk-&j2sdk-src-version;.md5sums">
    10   <!ENTITY j2sdk-bin-md5sum      "a55a9150977de7d5c7f78d29593a8b8c">
    11   <!ENTITY j2sdk-bin-size        "36.4 MB">
    12   <!ENTITY j2sdk-src-size        "55.1 MB (three .zip files)">
    13   <!ENTITY j2sdk-src-buildsize   "1285 MB">
    14   <!ENTITY j2sdk-time            "29.57 SBU">
     7  <!ENTITY jdk-download-source "http://java.sun.com/j2se/jrl_download.html">
     8  <!ENTITY jdk-download-binary "http://java.sun.com/j2se/1.5.0/download.jsp">
     9  <!ENTITY jdk-source-md5sum   "http://anduin.linuxfromscratch.org/sources/BLFS/SVN/I-K/jdk/jdk-&jdk-src-version;.md5sums">
     10  <!ENTITY jdk-bin-md5sum      "562d9797af801bfbe2b5e44417d8ccc4">
     11  <!ENTITY jdk-bin-size        "45 MB">
     12  <!ENTITY jdk-src-size        "65.7 MB (three .zip files)">
     13  <!ENTITY jdk-src-buildsize   "1444 MB">
     14  <!ENTITY jdk-time            "33.06 SBU">
    1515]>
    1616
    17 <sect1 id="j2sdk" xreflabel="J2SDK-&j2sdk-src-version;">
     17<sect1 id="jdk" xreflabel="JDK-&jdk-src-version;">
    1818<sect1info>
    1919<othername>$LastChangedBy$</othername>
    2020<date>$Date$</date>
    2121</sect1info>
    22 <?dbhtml filename="j2sdk.html" ?>
    23 <title><application>J2<acronym>SDK</acronym></application>-&j2sdk-src-version;</title>
    24 <indexterm zone="j2sdk">
    25 <primary sortas="a-J2SDK">J2SDK</primary>
     22<?dbhtml filename="jdk.html" ?>
     23<title><application>JDK</application>-&jdk-src-version;</title>
     24<indexterm zone="jdk">
     25<primary sortas="a-JDK">JDK</primary>
    2626</indexterm>
    2727
    2828<sect2>
    2929<title>Introduction to
    30 <application>J2<acronym>SDK</acronym></application></title>
    31 
    32 <para>The <application>J2<acronym>SDK</acronym></application> package contains
     30<application>JDK</application></title>
     31
     32<para>The <application>JDK</application> package contains
    3333Sun's <application>Java</application> development environment. This is useful
    3434for developing <application>Java</application> programs and provides the
    … …  
    4343This is not the case anymore.</para>
    4444
    45 <para>The source package requires registration at the Sun developer site and
    46 accepting the Sun Community Source License. The source code cannot be
     45<para>In order to use the source code and patches, you must read and agree
     46to the Sun <ulink url="http://java.sun.com/j2se/1.5.0/jrl_5.0-license.txt">
     47Java Research License</ulink>. In addition, the source code cannot be
    4748downloaded from some countries, so for users from those countries, the binary
    48 may be the only option.</para>
    49 
    50 <para>Even if you plan on compiling the <acronym>JDK</acronym> source, you will
    51 need to download the binary version to bootstrap the <acronym>JDK</acronym>
    52 build. Follow the link below to download both source and binary packages. When
    53 downloading the source (two files required), also download the
    54 <application>Mozilla</application> headers package available at the same
    55 location. To build from source, you'll end up downloading a total of four
    56 files.</para>
     49is the only option.</para>
     50
     51<para>If you plan on compiling the <acronym>JDK</acronym> source, you
     52will still need to download the binary version to bootstrap the
     53<acronym>JDK</acronym> build.  You will need to download a total of four
     54files to complete the source build: 
     55<filename>jdk-1_5_0_02-linux-i586.bin</filename>;
     56<filename>jdk-1_5_0-src-jrl.zip</filename>;
     57<filename>jdk-1_5_0-bin-jrl.zip</filename>;
     58and <filename>jdk-1_5_0-mozilla_headers-unix.zip</filename>.</para>
    5759
    5860<sect3><title>Package information</title>
    5961<itemizedlist spacing='compact'>
    6062<listitem><para>Binary download:
    61 <ulink url="&j2sdk-download-binary;"/></para></listitem>
     63<ulink url="&jdk-download-binary;"/></para></listitem>
     64<listitem><para>Version used (binary):
     65&jdk-bin-version;</para></listitem>
     66<listitem><para>Download MD5 sum (binary):
     67&jdk-bin-md5sum;</para></listitem>
    6268<listitem><para>Source download:
    63 <ulink url="&j2sdk-download-source;"/></para></listitem>
    64 <listitem><para>Version used (binary):
    65 &j2sdk-bin-version;</para></listitem>
    66 <listitem><para>Download MD5 sum (binary):
    67 &j2sdk-bin-md5sum;</para></listitem>
     69<ulink url="&jdk-download-source;"/></para></listitem>
    6870<listitem><para>Download MD5 sum (source):
    69 <ulink url="&j2sdk-source-md5sum;"/></para></listitem>
     71<ulink url="&jdk-source-md5sum;"/></para></listitem>
    7072<listitem><para>Download size (binary):
    71 &j2sdk-bin-size;</para></listitem>
     73&jdk-bin-size;</para></listitem>
    7274<listitem><para>Download size (source):
    73 &j2sdk-src-size;</para></listitem>
     75&jdk-src-size;</para></listitem>
    7476<listitem><para>Estimated disk space required:
    75 &j2sdk-src-buildsize;</para></listitem>
     77&jdk-src-buildsize;</para></listitem>
    7678<listitem><para>Estimated build time:
    77 &j2sdk-time;</para></listitem></itemizedlist>
     79&jdk-time;</para></listitem></itemizedlist>
    7880</sect3>
    7981
    80 <sect3><title>Additional downloads</title>
     82<sect3><title>Needed Patches</title>
    8183<itemizedlist spacing='compact'>
    82 <listitem><para><ulink 
    83 url="&patch-root;/j2sdk-&j2sdk-src-version;-fix_inline_asm-1.patch"/></para>
     84<listitem><para><ulink
     85url="&patch-root;/jdk-&jdk-src-version;-gcc_3.4.2+-3.patch"/></para>
    8486</listitem>
    8587<listitem><para><ulink
    86 url="&patch-root;/j2sdk-&j2sdk-src-version;-gcc33-1.patch"/></para>
     88url="&patch-root;/jdk-&jdk-src-version;-motif_mkmsgcat-1.patch"/></para>
    8789</listitem>
     90<listitem><para><ulink
     91url="&patch-root;/jdk-&jdk-src-version;-nptl-1.patch"/></para></listitem>
    8892<listitem><para><ulink
    89 url="&patch-root;/j2sdk-&j2sdk-src-version;-motif_mkmsgcat-1.patch"/></para>
     93url="&patch-root;/jdk-&jdk-src-version;-remove_broken_demo-1.patch"/></para>
    9094</listitem>
    91 <listitem><para><ulink
    92 url="&patch-root;/j2sdk-&j2sdk-src-version;-nptl-1.patch"/></para>
    93 </listitem>
    94 <listitem><para><ulink
    95 url="&patch-root;/j2sdk-&j2sdk-src-version;-remove_debug_image-1.patch"/></para>
    96 </listitem>
    97 <listitem><para><ulink
    98 url="&patch-root;/j2sdk-&j2sdk-src-version;-remove_fixed_paths-1.patch"/></para>
    99 </listitem>
    100 <listitem><para><ulink
    101 url="&patch-root;/j2sdk-&j2sdk-src-version;-static_cxx-1.patch"/></para>
    102 </listitem>
    103 <listitem><para><ulink
    104 url="&patch-root;/j2sdk-&j2sdk-src-version;-ash-1.patch"/>
    105 (Only required if /bin/sh is symlinked to <xref linkend="ash"/>)</para>
     95<listitem><para><ulink
     96url="&patch-root;/jdk-&jdk-src-version;-remove_fixed_paths-1.patch"/></para>
    10697</listitem>
    10798</itemizedlist>
    10899</sect3>
    109100
    110 <sect3><title><application>J2SDK</application> dependencies</title>
    111 <sect4><title>Required (to build <application>J2SDK</application> from
     101<sect3><title>Recommended Patches</title>
     102<itemizedlist spacing='compact'>
     103<listitem><para><ulink
     104url="&patch-root;/jdk-&jdk-src-version;-remove_debug_image-1.patch"/>
     105(Skips compiling of the <application>JDK</application> debug image)</para>
     106</listitem>
     107<listitem><para><ulink
     108url="&patch-root;/jdk-&jdk-src-version;-static_cxx-1.patch"/>
     109(Forces dynamic linking to gcc libs)</para></listitem>
     110<listitem><para><ulink
     111url="&patch-root;/jdk-&jdk-src-version;-xorg-6.8.1-1.patch"/>
     112(Only required if building agianst <xref linkend="xorg"/>)</para></listitem>
     113</itemizedlist>
     114</sect3>
     115
     116
     117<sect3><title><application>JDK</application> dependencies</title>
     118<sect4><title>Required (to build <application>JDK</application> from
    112119source)</title>
    113120<para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
    … …  
    115122<xref linkend="unzip"/>,
    116123<xref linkend="cpio"/>,
    117 <xref linkend="alsa"/>,
    118 <xref linkend="tcsh"/> and
    119 <xref linkend="gcc3"/></para>
     124<xref linkend="alsa"/>, and
     125<xref linkend="tcsh"/></para>
    120126</sect4>
    121127</sect3>
    … …  
    124130
    125131<sect2>
    126 <title>Installation of <application>J2SDK</application></title>
     132<title>Installation of <application>JDK</application></title>
    127133
    128134<para>Both versions will be installed in parallel. You may choose to keep
    129135either or both.</para>
    130136
    131 <para>Installation of the precompiled <acronym>JDK</acronym> is easy:
    132 create a directory to install from, copy the .bin there, and run the
     137<para>Install the precompiled <acronym>JDK</acronym> with the
    133138following commands:</para>
    134139
    135 <screen><userinput><command>export VERSION=&j2sdk-bin-version; &amp;&amp;
     140<screen><userinput><command>export VERSION=&jdk-bin-version; &amp;&amp;
    136141export MV=`echo $VERSION | cut -d "_" -f 1,1` &amp;&amp;
    137142export V=`echo ${VERSION} | sed -e "s/\./_/g"` &amp;&amp;
    138 sed -i "s:^PATH=.*::" j2sdk-${V}-linux-i?86.bin &amp;&amp;
    139 chmod +x j2sdk-${V}-linux-i?86.bin &amp;&amp;
     143sed -i "s:^PATH=.*::" jdk-${V}-linux-i?86.bin &amp;&amp;
     144chmod +x jdk-${V}-linux-i?86.bin &amp;&amp;
    140145mkdir -p bin &amp;&amp;
    141146ln -sf /bin/true bin/more &amp;&amp;
    142 yes | PATH=$PWD/bin:$PATH ./j2sdk-${V}-linux-i?86.bin &amp;&amp;
    143 cd j2sdk${VERSION}</command></userinput></screen>
     147yes | PATH=$PWD/bin:$PATH ./jdk-${V}-linux-i?86.bin &amp;&amp;
     148cd jdk${VERSION}</command></userinput></screen>
    144149
    145150<para>Now, as the root user:</para>
    146151
    147 <screen><userinput role='root'><command>install -d /opt/j2sdk/j2sdk-precompiled-${MV} &amp;&amp;
    148 mv * /opt/j2sdk/j2sdk-precompiled-${MV}
    149 chown -R root:root /opt/j2sdk/j2sdk-precompiled-${MV}</command></userinput></screen>
     152<screen><userinput role='root'><command>install -d /opt/jdk/jdk-precompiled-${MV} &amp;&amp;
     153mv * /opt/jdk/jdk-precompiled-${MV}
     154chown -R root:root /opt/jdk/jdk-precompiled-${MV}</command></userinput></screen>
    150155
    151156<para>The binary version is now installed.</para>
    … …  
    157162<para>Add the recently installed <acronym>JDK</acronym> to the path.</para>
    158163
    159 <screen><userinput><command>export JAVA_HOME=/opt/j2sdk/j2sdk-precompiled-${MV} &amp;&amp;
     164<screen><userinput><command>export JAVA_HOME=/opt/jdk/jdk-precompiled-${MV} &amp;&amp;
    160165export PATH=$PATH:${JAVA_HOME}/bin</command></userinput></screen>
    161166
    162167<para>Unzip the sources:</para>
    163168
    164 <screen><userinput><command>mkdir j2sdk-build &amp;&amp;
    165 cd j2sdk-build &amp;&amp;
    166 VERSION=&j2sdk-src-version; &amp;&amp;
     169<screen><userinput><command>mkdir jdk-build &amp;&amp;
     170cd jdk-build &amp;&amp;
     171VERSION=&jdk-src-version; &amp;&amp;
    167172V=`echo $VERSION | sed -e "s/\./_/g"` &amp;&amp;
    168 unzip ../j2sdk-${V}-src-scsl.zip &amp;&amp;
    169 unzip ../j2sdk-${V}-mozilla_headers-unix.zip &amp;&amp;
    170 unzip ../j2sdk-${V}-bin-scsl.zip</command></userinput></screen>
     173unzip ../jdk-${V}-src-jrl.zip &amp;&amp;
     174unzip ../jdk-${V}-bin-jrl.zip &amp;&amp;
     175unzip ../jdk-${V}-mozilla_headers-unix.zip</command></userinput></screen>
    171176
    172177<para>Apply all the patches downloaded above.</para>
    173178
    174 <screen><userinput><command>for PATCH in ../j2sdk-&j2sdk-src-version;*.patch
    175 do
    176    patch -Np1 -i $PATCH
     179<screen><userinput><command>for PATCH in ../jdk-&jdk-src-version;*.patch
     180    do patch -Np1 -i ${PATCH}
    177181done</command></userinput></screen>
    178182
    … …  
    186190unset LDFLAGS
    187191export ALT_DEVTOOLS_PATH="/usr/bin" &amp;&amp;
    188 export BUILD_NUMBER="blfs-`date +%s`" &amp;&amp;
     192export BUILD_NUMBER="blfs-&blfs-version;" &amp;&amp;
    189193export DEV_ONLY=true &amp;&amp;
    190194export ALT_MOZILLA_PATH=$PWD &amp;&amp;
    191195export INSANE=true &amp;&amp;
    192196export MAKE_VERBOSE=true &amp;&amp;
    193 export ALT_CACERTS_FILE=${ALT_BOOTDIR}/jre/lib/security/cacerts
    194 export PATH_HOLD=$PATH
    195 export PATH=/opt/gcc-&gcc3-version;/bin:$PATH</command></userinput></screen>
     197export ALT_CACERTS_FILE=${ALT_BOOTDIR}/jre/lib/security/cacerts</command></userinput></screen>
    196198
    197199<warning><para>Setting CFLAGS/CXXFLAGS/LDFLAGS is guaranteed to make the build
    … …  
    199201OTHER_CFLAGS/OTHER_CXXFLAGS/OTHER_LDFLAGS instead.</para></warning>
    200202
    201 <para>Additionally, if you would like to make in parallel, add the following
    202 (adjust <envar>MAKE_PARALLEL</envar> to your liking):</para>
    203 
    204 <screen><userinput><command>export HOTSPOT_BUILD_JOBS=$MAKE_PARALLEL</command></userinput></screen>
    205 
    206 <para>If the included <application>Motif</application> doesn't build properly,
    207 the error is noticed much later in the build. A solution is to build the
    208 <application>Motif</application> library before compiling the
    209 <application>J2<acronym>SDK</acronym></application>.</para>
    210 
    211 <screen><userinput><command>cd motif/lib/Xm &amp;&amp;
    212 make &amp;&amp;
    213 cd ../../..</command></userinput></screen>
    214 
    215 <para>Build <application>J2SDK</application> with the following
     203<para>Additionally, if you would like to make in parallel, add the
     204following:</para>
     205
     206<screen><userinput><command>export HOTSPOT_BUILD_JOBS=<replaceable>[3]</replaceable></command></userinput></screen>
     207
     208<para>Build the <application>JDK</application> with the following
    216209commands. There will be a lot of messages about missing files that look like
    217 errors. As long as the build doesn't stop, the messages are harmless, so
    218 ignore them.</para>
     210errors. These are caused by not meeting the expected build environemnt
     211(Red Hat).  As long as the build doesn't stop, the messages
     212are harmless.</para>
    219213
    220214<screen><userinput><command>cd control/make &amp;&amp;
    … …  
    222216cd ../build/linux-i?86</command></userinput></screen>
    223217
    224 <para>Now, as the root user, install <application>J2SDK</application>:</para>
    225 
    226 <screen><userinput role='root'><command>cp -a j2sdk-image /opt/j2sdk/j2sdk-&j2sdk-src-version; &amp;&amp;
    227 chown -R root:root /opt/j2sdk/j2sdk-&j2sdk-src-version;</command></userinput></screen>
     218<para>Now, as the root user, install the <application>JDK</application>:</para>
     219
     220<screen><userinput role='root'><command>cp -a j2sdk-image /opt/jdk/jdk-&jdk-src-version; &amp;&amp;
     221chown -R root:root /opt/jdk/jdk-&jdk-src-version;</command></userinput></screen>
    228222
    229223<para>Restore the environment using the following commands:</para>
    … …  
    239233unset INSANE &amp;&amp;
    240234unset MAKE_VERBOSE &amp;&amp;
    241 unset ALT_CACERTS_FILE &amp;&amp;
    242 export PATH=$PATH_HOLD &amp;&amp;
    243 unset PATH_HOLD</command></userinput></screen>
     235unset ALT_CACERTS_FILE</command></userinput></screen>
    244236
    245237</sect2>
    … …  
    251243the location of the bootstrap <acronym>JDK</acronym>.</para>
    252244
    253 <para><command>export ALT_MOZILLA_PATH=$PWD</command>: This sets the
    254 variable that points to where you unzipped the
    255 <application>Mozilla</application> headers.</para>
     245<para><command>export ALT_MOZILLA_PATH=$PWD</command>: This tells the build
     246where to find the base directory of the plugin path (which contains the
     247<application>Mozilla</application> headers).</para>
    256248
    257249<para><command>export ALT_DEVTOOLS_PATH="/usr/bin"</command>: This
    258250changes the location where the build finds the needed executables.</para>
    259251
    260 <para><command>export BUILD_NUMBER="blfs-`date +%s`"</command>: This will
    261 help you identify this compiled version of the runtime environment and
    262 virtual machine by appending this information to the version in the
    263 output to <command>java -version</command>.</para>
     252<para><command>export BUILD_NUMBER="blfs-&blfs-version;"</command>:
     253This will help you identify the compiled version of the runtime environment
     254and virtual machine by appending this information to the version
     255string.</para>
    264256
    265257<para><command>export DEV_ONLY=true</command>: This command
    266 eliminates compiling the documentation and a dependency for
     258skips compiling the documentation and eliminates a dependency on
    267259<application>rpm</application>.</para>
    268260
    … …  
    275267instructions.</para>
    276268
    277 <para><command>unset CFLAGS...</command>: These flags cause miscompilation
    278 of the build. Never set these.</para>
    279 
    280 <para><command>export INSANE=true</command>: Unless you specify that you
    281 are insane the build will not proceed. The certified platform for the build is
    282 Redhat 6.1. The above variable ensures that all the errors related to
    283 compiling on a non-certified platform will be converted to warnings.</para>
    284 
    285 <para><command>export MAKE_VERBOSE=true</command>: Allows the current
    286 compilation command to be displayed on the console.</para>
     269<para><command>unset CFLAGS/CXXFLAGS...</command>: These variables cause
     270miscompilation of the build. Never set them.</para>
     271
     272<para><command>export INSANE=true</command>: The certified platform for the
     273build is Redhat Enterprise Advanced Server 2.1. This variable ensures that
     274all the errors related to compiling on a non-certified platform will be
     275displayed as warnings instead of errors.</para>
     276
     277<para><command>export MAKE_VERBOSE=true</command>: Allows the compiler
     278commands to be displayed on the console.</para>
    287279
    288280<para><command>export ALT_CACERTS_FILE...</command>: Specifies the
    289 certificate file to use.</para>
     281certificate file to use (from the installed binary
     282<application>JDK</application>).</para>
    290283
    291284</sect2>
    292285
    293286<sect2>
    294 <title>Configuring <application>J2SDK</application></title>
     287<title>Configuring <application>JDK</application></title>
    295288
    296289<sect3><title>Configuration Information</title>
    297290
    298291<para>There are now two Java 2 <acronym>SDK</acronym>'s installed in
    299 <filename>/opt/j2sdk</filename>. You should decide on which one you
     292<filename>/opt/jdk</filename>. You should decide on which one you
    300293would like to use as the default. For example if you decide to use the source
    301 compiled <application>J2SDK</application>, do the following:</para>
    302 
    303 <screen><userinput><command>ln -nsf j2sdk-&j2sdk-src-version; /opt/j2sdk/j2sdk</command></userinput></screen>
    304 
    305 <para>Add the following lines to your shell startup file (e.g.,
    306 <filename>/etc/profile</filename>).</para>
    307 
    308 <screen><userinput>export JAVA_HOME=/opt/j2sdk/j2sdk
    309 export PATH=$PATH:$JAVA_HOME/bin</userinput></screen>
    310 
    311 <para>Add <filename>$JAVA_HOME/man</filename> to your
    312 <envar>MANPATH</envar> variable or to
    313 <filename>/etc/man.conf</filename></para>
    314 
    315 <para>The <application>Java</application> plugin is in the directory
    316 <filename class="directory">$JAVA_HOME/jre/plugin/i?86/ns610/</filename>.
    317 Make a symbolic link to the file in that directory from your plugins directory.
    318 Note that the plugin must be a symlink for it to work. If not, the browsers
     294compiled <application>JDK</application>, do the following:</para>
     295
     296<screen><userinput><command>ln -nsf jdk-&jdk-src-version; /opt/jdk/jdk</command></userinput></screen>
     297
     298<para>Add the following <filename>jdk.sh</filename> shell startup file to
     299the <filename>/etc/profile.d</filename> directory with the following
     300commands:</para>
     301
     302<screen><userinput><command>cat &gt; /etc/profile.d/jdk.sh &lt;&lt; "EOF"</command>
     303# Begin /etc/profile.d/jdk.sh
     304
     305# Set JAVA_HOME directory
     306JAVA_HOME=/opt/jdk/jdk
     307export JAVA_HOME
     308
     309# Adjust PATH and MANPATH
     310pathappend ${JAVA_HOME}/bin PATH
     311pathappend ${JAVA_HOME}/man MANPATH
     312
     313# Auto Java Classpath Updating
     314# Create symlinks to this directory for auto classpath setting
     315AUTO_CLASSPATH_DIR=/usr/lib/classpath
     316if [ -z ${CLASSPATH} ]; then
     317        CLASSPATH=.:${AUTO_CLASSPATH_DIR}
     318else
     319        pathappend . CLASSPATH
     320        pathappend ${AUTO_CLASSPATH_DIR} CLASSPATH
     321fi
     322
     323for i in $(ls ${AUTO_CLASSPATH_DIR}/*.jar 2>/dev/null)
     324        do pathappend ${i} CLASSPATH
     325done
     326
     327# End /etc/profile.d/jdk.sh
     328<command>EOF</command></userinput></screen>
     329
     330<para>The <application>Java</application> plugin is loacated in
     331<filename class="directory">$JAVA_HOME/jre/plugin/i?86/ns7/</filename>.
     332Make a symbolic link to the file in that directory from your browser
     333plugins directory.</para>
     334
     335<note><para>The plugin must be a symlink for it to work. If not, the browsers
    319336just crash when you attempt to load a <application>Java</application>
    320 plugin.</para>
    321 
    322 </sect3>
    323 
    324 <sect3><title>Handling CLASSPATH</title>
    325 
    326 <para>When compiling packages, the <envar>CLASSPATH</envar> environment
    327 variable is used by the <acronym>JDK</acronym> to locate classes at
    328 compile-time and run-time. It is tedious to add all the classes used to the
    329 <envar>CLASSPATH</envar> manually. You may add the following lines to your
    330 shell startup file to set <envar>CLASSPATH</envar> automatically to include
    331 all JAR files in a specified directory, which in the example below is
    332 <filename>/usr/lib/auto-java-classpath</filename>.</para>
    333 
    334 <screen><userinput>AUTO_CLASSPATH_DIR=/usr/lib/auto-java-classpath
    335 if [ -z $CLASSPATH ]
    336 then
    337   CLASSPATH=.:$AUTO_CLASSPATH_DIR
    338 else
    339   CLASSPATH=$CLASSPATH:.:$AUTO_CLASSPATH_DIR
    340 fi
    341 for i in $(ls $AUTO_CLASSPATH_DIR/*.jar 2>/dev/null)
    342 do
    343   CLASSPATH=$CLASSPATH:$i
    344 done</userinput></screen>
     337application.</para></note>
    345338
    346339</sect3>
    … …  
    362355<seg><envar>$JAVA_HOME</envar>/lib/*, <envar>$JAVA_HOME</envar>/jre/lib/*
    363356and libjavaplugin_oji.so</seg>
    364 <seg>/opt/j2sdk</seg>
     357<seg>/opt/jdk</seg>
    365358</seglistitem>
    366359</segmentedlist>
    … …  
    374367<listitem><para>runs <application>Java</application> applets outside of the
    375368context of a browser.</para>
    376 <indexterm zone="j2sdk appletviewer">
     369<indexterm zone="jdk appletviewer">
    377370<primary sortas="b-appletviewer">appletviewer</primary>
    378371</indexterm></listitem>
    … …  
    384377and version conflicts with any extensions installed in the
    385378<acronym>JDK</acronym> software.</para>
    386 <indexterm zone="j2sdk extcheck">
     379<indexterm zone="jdk extcheck">
    387380<primary sortas="b-extcheck">extcheck</primary>
    388381</indexterm></listitem>
    … …  
    393386<listitem><para>generates <application>Java</application> bindings from a
    394387given <acronym>IDL</acronym> file.</para>
    395 <indexterm zone="j2sdk idlj">
     388<indexterm zone="jdk idlj">
    396389<primary sortas="b-idlj">idlj</primary>
    397390</indexterm></listitem>
    … …  
    402395<listitem><para>combines multiple files into a single <acronym>JAR</acronym>
    403396archive file.</para>
    404 <indexterm zone="j2sdk jar">
     397<indexterm zone="jdk jar">
    405398<primary sortas="b-jar">jar</primary>
    406399</indexterm></listitem>
    … …  
    412405verifies the signatures and integrity of a signed
    413406<filename>JAR</filename>.</para>
    414 <indexterm zone="j2sdk jarsigner">
     407<indexterm zone="jdk jarsigner">
    415408<primary sortas="b-jarsigner">jarsigner</primary>
    416409</indexterm></listitem>
    … …  
    422415starting a <application>Java</application> runtime environment, loading a
    423416specified class and invoking its main method.</para>
    424 <indexterm zone="j2sdk java">
     417<indexterm zone="jdk java">
    425418<primary sortas="b-java">java</primary>
    426419</indexterm></listitem>
    … …  
    432425<application>Java</application> programming language, and compiles them into
    433426bytecode class files.</para>
    434 <indexterm zone="j2sdk javac">
     427<indexterm zone="jdk javac">
    435428<primary sortas="b-javac">javac</primary>
    436429</indexterm></listitem>
    … …  
    443436of <acronym>HTML</acronym> pages describing the classes, interfaces,
    444437constructors, methods, and fields.</para>
    445 <indexterm zone="j2sdk javadoc">
     438<indexterm zone="jdk javadoc">
    446439<primary sortas="b-javadoc">javadoc</primary>
    447440</indexterm></listitem>
    … …  
    452445<listitem><para>generates <application>C</application> header and source files
    453446that are needed to implement native methods.</para>
    454 <indexterm zone="j2sdk javah">
     447<indexterm zone="jdk javah">
    455448<primary sortas="b-javah">javah</primary>
    456449</indexterm></listitem>
    … …  
    461454<listitem><para>disassembles a <application>Java</application> class
    462455file.</para>
    463 <indexterm zone="j2sdk javap">
     456<indexterm zone="jdk javap">
    464457<primary sortas="b-javap">javap</primary>
    465458</indexterm></listitem>
    … …  
    470463<listitem><para>is a simple command-line debugger for
    471464<application>Java</application> classes.</para>
    472 <indexterm zone="j2sdk jdb">
     465<indexterm zone="jdk jdb">
    473466<primary sortas="b-jdb">jdb</primary>
    474467</indexterm></listitem>
    … …  
    478471<term><command>keytool</command></term>
    479472<listitem><para>is a key and certificate management utility.</para>
    480 <indexterm zone="j2sdk keytool">
     473<indexterm zone="jdk keytool">
    481474<primary sortas="b-keytool">keytool</primary>
    482475</indexterm></listitem>
    … …  
    487480<listitem><para> converts files that contain non-supported character encoding
    488481into files containing Latin-1 or Unicode-encoded characters.</para>
    489 <indexterm zone="j2sdk native2ascii">
     482<indexterm zone="jdk native2ascii">
    490483<primary sortas="b-native2ascii">native2ascii</primary>
    491484</indexterm></listitem>
    … …  
    497490persistent objects on servers in the <acronym>CORBA</acronym>
    498491environment.</para>
    499 <indexterm zone="j2sdk orbd">
     492<indexterm zone="jdk orbd">
    500493<primary sortas="b-orbd">orbd</primary>
    501494</indexterm></listitem>
    … …  
    505498<term><command>policytool</command></term>
    506499<listitem><para>creates and manages a policy file graphically.</para>
    507 <indexterm zone="j2sdk policytool">
     500<indexterm zone="jdk policytool">
    508501<primary sortas="b-policytool">policytool</primary>
    509502</indexterm></listitem>
    … …  
    515508from the names of compiled <application>Java</application> classes that
    516509contain remote object implementations.</para>
    517 <indexterm zone="j2sdk rmic">
     510<indexterm zone="jdk rmic">
    518511<primary sortas="b-rmic">rmic</primary>
    519512</indexterm></listitem>
    … …  
    523516<term><command>rmid</command></term>
    524517<listitem><para>starts the activation system daemon.</para>
    525 <indexterm zone="j2sdk rmid">
     518<indexterm zone="jdk rmid">
    526519<primary sortas="b-rmid">rmid</primary>
    527520</indexterm></listitem>
    … …  
    532525<listitem><para>creates and starts a remote object registry on the specified
    533526port on the current host.</para>
    534 <indexterm zone="j2sdk rmiregistry">
     527<indexterm zone="jdk rmiregistry">
    535528<primary sortas="b-rmiregistry">rmiregistry</primary>
    536529</indexterm></listitem>
    … …  
    541534<listitem><para>returns the serialVersionUID for one or more classes in a
    542535form suitable for copying into an evolving class.</para>
    543 <indexterm zone="j2sdk serialver">
     536<indexterm zone="jdk serialver">
    544537<primary sortas="b-serialver">serialver</primary>
    545538</indexterm></listitem>
    … …  
    550543<listitem><para>provides an ease-of-use interface for application programmers
    551544to register, unregister, startup and shutdown a server.</para>
    552 <indexterm zone="j2sdk servertool">
     545<indexterm zone="jdk servertool">
    553546<primary sortas="b-servertool">servertool</primary>
    554547</indexterm></listitem>
    … …  
    559552<listitem><para>starts the <application>Java</application>
    560553<acronym>IDL</acronym> name server.</para>
    561 <indexterm zone="j2sdk tnameserv">
     554<indexterm zone="jdk tnameserv">
    562555<primary sortas="b-tnameserv">tnameserv</primary>
    563556</indexterm></listitem>

  • general/prog/pdl.xml

    r6a25deb2 r5f0bab7  
    183183<ulink url="http://www.svgalib.org/">SVGAlib</ulink>,
    184184<xref linkend="gnome-libs"/>,
    185 <xref linkend="j2sdk"/>,
     185<xref linkend="jdk"/>,
    186186<xref linkend="tk"/>,
    187187<xref linkend="python"/> (with the

  • general/prog/prog.xml

    r6a25deb2 r5f0bab7  
    2323<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gcc3.xml"/>
    2424<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="guile.xml"/>
    25 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="j2sdk.xml"/>
     25<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="jdk.xml"/>
    2626<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="librep.xml"/>
    2727<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nasm.xml"/>

  • general/sysutils/apache-ant.xml

    r6a25deb2 r5f0bab7  
    5959<sect3><title><application>Apache Ant</application> dependencies</title>
    6060<sect4><title>Required</title>
    61 <para><xref linkend="j2sdk"/></para>
     61<para><xref linkend="jdk"/></para>
    6262</sect4>
    6363</sect3>

  • gnome/add/java-access-bridge.xml

    r6a25deb2 r5f0bab7  
    5353<sect3><title><application>Java Access Bridge</application> dependencies</title>
    5454<sect4><title>Required</title>
    55 <para><xref linkend="at-spi"/> and <xref linkend="j2sdk"/></para>
     55<para><xref linkend="at-spi"/> and <xref linkend="jdk"/></para>
    5656</sect4>
    5757</sect3>

  • introduction/welcome/changelog.xml

    r6a25deb2 r5f0bab7  
    2323<itemizedlist>
    2424
     25<listitem><para>April 24th, 2005 [dj]: Updated to JDK-1.5.0, added gcc-3.4.2+
     26and jdk-1.5.0 patches to OpenOffice, and added jdk-1.5.0 patch for
     27fop.</para></listitem>
     28
    2529<listitem><para>April 24th, 2005 [randy]: Fixed incorrect path pointing to the
    2630documentation in the Cyrus-SASL configuration section and incorrect library

  • introduction/welcome/credits.xml

    r6a25deb2 r5f0bab7  
    190190<listitem><para>MySQL: <emphasis>Jesse Tie-Ten-Quee</emphasis></para></listitem>
    191191
    192 <listitem><para>fontconfig, gcc, gcc2, j2sdk, mozilla, nas, openoffice, ispell, nail,
     192<listitem><para>fontconfig, gcc, gcc2, jdk, mozilla, nas, openoffice, ispell, nail,
    193193ImageMagick, hd2u,
    194194STLport, tcl, tk and bind-utils: <emphasis>Tushar Teredesai</emphasis></para></listitem>
    … …  
    294294<!--
    295295<listitem><para><emphasis>Tushar Teredesai</emphasis> for writing the
    296 Compiling Java 2 SDK from Scratch hint on which j2sdk is based and for writing
     296Compiling Java 2 SDK from Scratch hint on which jdk is based and for writing
    297297the docbook hint used throughout the typesetting chapter.</para></listitem>
    298298-->

  • kde/add/kdebindings.xml

    r6a25deb2 r5f0bab7  
    6464    <xref linkend="python"/>,
    6565    <xref linkend="ruby"/>,
    66     <xref linkend="j2sdk"/>,
     66    <xref linkend="jdk"/>,
    6767    <xref linkend="mozilla"/>,
    6868    <ulink url="http://go-mono.org">Mono</ulink>,

  • kde/core/kdebase.xml

    r6a25deb2 r5f0bab7  
    6363<xref linkend="libxml2"/>,
    6464<xref linkend="openssl"/> and
    65 <xref linkend="j2sdk"/></para>
     65<xref linkend="jdk"/></para>
    6666</sect4>
    6767

  • postlfs/security/cyrus-sasl.xml

    r6a25deb2 r5f0bab7  
    6161<xref linkend="openldap"/>,
    6262<xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
    63 <xref linkend="j2sdk"/>,
     63<xref linkend="jdk"/>,
    6464<xref linkend="mysql"/>,
    6565<xref linkend="postgresql"/>,

  • pst/printing/cups.xml

    r6a25deb2 r5f0bab7  
    6464<xref linkend="php"/>,
    6565<xref linkend="python"/>,
    66 <xref linkend="j2sdk"/>,
     66<xref linkend="jdk"/>,
    6767<ulink url="http://www.openslp.org/">OpenSLP</ulink>,
    6868<ulink url="http://packages.debian.org/unstable/source/libpaper">

  • pst/ps/fop.xml

    r6a25deb2 r5f0bab7  
    5858</sect3>
    5959
     60<sect3><title>Required Patch</title>
     61<itemizedlist spacing='compact'>
     62<listitem><para><ulink
     63url="&patch-root;/fop_&fop-version;-jdk_&jdk-src-version;-1.patch"/> For
     64use with jdk-&jdk-src-version;.</para>
     65</listitem>
     66</itemizedlist>
     67</sect3>
     68
    6069<sect3><title>Additional downloads</title>
    6170<itemizedlist spacing="compact">
    … …  
    7887<sect3><title><application>FOP</application> dependencies</title>
    7988<sect4><title>Required</title>
    80 <para><xref linkend="j2sdk"/></para>
     89<para><xref linkend="jdk"/></para>
    8190</sect4>
    8291
    … …  
    95104<title>Installation of <application>FOP</application></title>
    96105
    97 <note><para>Ensure <envar>$JAVA_HOME</envar> is set correctly before beginning
    98 the build. Additionally, the build will fail if your version of the
    99 <acronym>JDK</acronym> is higher than 1.4.2_x.</para></note>
    100 
    101106<para>Some versions of tar will display a message similar to
    102107<quote><computeroutput>tar: A lone zero block at 33476</computeroutput></quote>
    … …  
    120125following commands:</para>
    121126
    122 <screen><userinput><command>./build.sh &amp;&amp;
     127<screen><userinput><command>patch -Np1 -i ../fop_&fop-version;-jdk_&jdk-src-version;-1.patch &amp;&amp;
     128./build.sh &amp;&amp;
    123129sed -i -e "s/build/lib/" fop.sh</command></userinput></screen>
    124130

  • server/databases/db.xml

    r6a25deb2 r5f0bab7  
    4646<sect3><title><application>Berkeley DB</application> dependencies</title>
    4747<sect4><title>Optional</title>
    48 <para><xref linkend="tcl"/> and <xref linkend="j2sdk"/></para>
     48<para><xref linkend="tcl"/> and <xref linkend="jdk"/></para>
    4949</sect4>
    5050</sect3>

  • server/major/openssh.xml

    r6a25deb2 r5f0bab7  
    5757X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
    5858<xref linkend="mitkrb"/> or <xref linkend="heimdal"/>,
    59 <xref linkend="j2sdk"/>,
     59<xref linkend="jdk"/>,
    6060<xref linkend="net-tools"/>,
    6161<ulink url="http://www.opensc.org/">OpenSC</ulink> and

  • xsoft/graphweb/firefox.xml

    r6a25deb2 r5f0bab7  
    164164<para>For installing various <application>Firefox</application> plugins, refer
    165165to <ulink url="http://plugindoc.mozdev.org/linux.html">Mozdev's PluginDoc
    166 Project</ulink>. If you have <xref linkend="j2sdk"/> already installed, create
     166Project</ulink>. If you have <xref linkend="jdk"/> already installed, create
    167167the following link as the root user to utilize the
    168168<application>JAVA</application> plugin: </para>

  • xsoft/graphweb/mozilla.xml

    r6a25deb2 r5f0bab7  
    343343<para>For installing various <application>Mozilla</application> plugins, refer
    344344to <ulink url="http://plugindoc.mozdev.org/linux.html">Mozdev's PluginDoc
    345 Project</ulink>. If you have <xref linkend="j2sdk"/> already installed, create
     345Project</ulink>. If you have <xref linkend="jdk"/> already installed, create
    346346the following link as the root user to utilize the
    347347<application>JAVA</application> plugin: </para>

  • xsoft/suites/openoffice.xml

    r6a25deb2 r5f0bab7  
    4949<itemizedlist spacing='compact'>
    5050
    51 <listitem><para>Required patch for gcc-&gcc3-version;: <ulink
    52 url="&patch-root;/OOo_&openoffice-version;-gcc33-1.patch"/></para>
     51<listitem><para>Required patch for gcc-&gcc-version;: <ulink
     52url="&patch-root;/OOo_&openoffice-version;-gcc_3.4.2+_fixes-1.patch"/></para>
    5353</listitem>
    5454
    … …  
    5858
    5959<listitem><para>Required patch if compiling with
    60 <acronym>J2SDK</acronym>-&j2sdk-src-version;: <ulink
    61 url="&patch-root;/OOo_&openoffice-version;-jdk_&j2sdk-src-version;_fix-1.patch"/></para>
     60<acronym>JDK</acronym>-&jdk-src-version;: <ulink
     61url="&patch-root;/OOo_&openoffice-version;-jdk_&jdk-src-version;_fix-1.patch"/></para>
    6262</listitem>
    6363
    … …  
    6868</listitem>
    6969
     70<listitem><para>Required patch for STLport-4.6.2: <ulink
     71url="&patch-root;/OOo_&openoffice-version;-STLport_4.6.2-1.patch"/></para>
     72</listitem>
     73
    7074<listitem><para>Optional patch if you wish to use the system freetype:
    7175<ulink
    … …  
    7983</listitem>
    8084
    81 <listitem><para>General Polygon Clipper Library (Optional if
    82 libart_lgpl-&libart_lgpl-version; is used): <ulink
    83 url="ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z"/></para>
     85<listitem><para>STLport-4.6.2: <ulink
     86url="http://www.stlport.org/archive/STLport-4.6.2.tar.gz"/></para>
    8487</listitem>
    8588
    … …  
    97100<xref linkend="zip"/>,
    98101<xref linkend="unzip"/>,
    99 <xref linkend="tcsh"/>,
    100 <xref linkend="which"/> and
    101 <xref linkend="gcc3"/>.</para>
     102<xref linkend="tcsh"/>, and
     103<xref linkend="which"/>.</para>
    102104</sect4>
    103105
    104106<sect4><title>Recommended</title>
    105 <para><xref linkend="j2sdk"/>,
     107<para><xref linkend="jdk"/>,
    106108<xref linkend="freetype2"/>,
    107109<xref linkend="pkgconfig"/>,
    108 <xref linkend="startup-notification"/> and
    109 <xref linkend="desktop-file-utils"/>.</para>
     110<xref linkend="startup-notification"/>,
     111<xref linkend="desktop-file-utils"/>,
     112<xref linkend="apache-ant"/>,
     113<xref linkend="libart_lgpl"/>, and
     114<xref linkend="curl"/>.</para>
     115
    110116</sect4>
    111117
    112118<sect4><title>Optional</title>
    113 <para><xref linkend="Linux_PAM"/>,
    114 <xref linkend="libart_lgpl"/>,
    115 <xref linkend="apache-ant"/> and
    116 <xref linkend="curl"/>.</para>
     119<para><xref linkend="Linux_PAM"/> and
     120<xref linkend="nas"/>.</para>
    117121</sect4>
    118122</sect3>
    … …  
    131135tar -zxf ../OOo_&openoffice-version;_source.tar.gz</command></userinput></screen>
    132136
    133 <para>Optionally, untar and move the gpc files, and apply the downloaded
    134 patches:</para>
    135 
    136 <screen><userinput><command>tar -zxf ../gpc231.tar.Z &amp;&amp;
    137 mv gpc231/* external/gpc &amp;&amp;
    138 rmdir gpc231 &amp;&amp;
    139 for patch in ../OOo_&openoffice-version;-*.patch
    140   do patch -Np1 -i $patch
    141   done</command></userinput></screen>
     137<para>Apply all of the downloaded patches:</para>
     138
     139<screen><userinput><command>for PATCH in ../OO_&openoffice-version;-*.patch
     140    do patch -Np1 -i ${PATCH}
     141done</command></userinput></screen>
     142
     143<para>Copy the STLport <acronym>TAR</acronym>ball into the source tree:</para>
     144
     145<screen><userinput><command>cp ../STLport-4.6.2.tar.gz stlport/download/</command></userinput></screen>
    142146
    143147<para>STLport looks for the c++ headers in the wrong location.  Put a
    144148temporary symlink in place to satisfy STLport:</para>
    145149
    146 <screen><userinput><command>ln -sf /opt/gcc-&gcc3-version;/include/c++/&gcc3-version; /usr/g++-v3</command></userinput></screen>
    147 
    148 <para>OpenOffice fails to build with gcc-3.4.1.  Set your path to
    149 include gcc-&gcc3-version;:</para>
    150 
    151 <screen><userinput><command>export PATH_HOLD=$PATH &amp;&amp;
    152 export PATH=/opt/gcc-&gcc3-version;/bin:$PATH</command></userinput></screen>
     150<screen><userinput><command>ln -sf /usr/include/c++/&gcc-version; /usr/g++-v3</command></userinput></screen>
     151
     152<para>Create a temprorary symlink to the <acronym>JRE</acronym>'s
     153<application>motif</application> libraries:</para>
     154
     155<screen><userinput><command>ln -sf ${JAVA_HOME}/jre/lib/motif21/libmawt.so /usr/lib</command></userinput></screen>
    153156
    154157<para>If you want to optimize the build, edit
    … …  
    174177    --with-dict=ENUS --without-fonts \
    175178    --enable-libsn --with-system-zlib \
    176     --with-system-freetype &amp;&amp;
     179    --with-system-freetype \
     180    --with-system-curl --disable-fontooo \
     181    --enable-libart &amp;&amp;
    177182cd ..</command></userinput></screen>
    178183
    … …  
    227232rename ooo645 ooo /usr/share/applications/ooo645*.desktop</command></userinput></screen>
    228233
    229 <para>Finally, return your environment to it's original state:</para>
    230 
    231 <screen><userinput><command>export PATH=$PATH_HOLD &amp;&amp;
    232 rm -f /usr/g++-v3</command></userinput></screen>
     234<para>Finally, remove the temporary symlinks:</para>
     235
     236<screen><userinput><command>rm /usr/g++-v3 &amp;&amp;
     237rm /usr/lib/libmawt.so</command></userinput></screen>
    233238
    234239</sect2>
    … …  
    236241<sect2>
    237242<title>Command explanations</title>
    238 
    239 <para>
    240 <command>mv ../gpc231/gpc.* external/gpc</command>: Copy the gpc files to the
    241 appropriate location.</para>
    242243
    243244<para><parameter>--with-lang=ENUS</parameter>: Make install set for the
Note: See TracChangeset for help on using the changeset viewer.