Changeset 0ccfdd3a


Ignore:
Timestamp:
06/14/2014 01:17:16 AM (8 years ago)
Author:
Fernando de Oliveira <fernando@…>
Branches:
10.0, 10.1, 11.0, 11.1, 7.10, 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, krejzi/svn, lazarus, nosym, perl-modules, qt5new, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/test-20220226
Children:
ef362a7
Parents:
b4f8b750
Message:

Modify build instructions for firefox-30.0 and thunderbird-24.6.0.
Uncoment 'ac_add_options --enable-system-cairo' in xulrunner/firefox-30.0 and thunderbird-24.6.0. Thanks Armin K.

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

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • introduction/welcome/changelog.xml

    rb4f8b750 r0ccfdd3a  
    4949      <itemizedlist>
    5050        <listitem>
     51          <para>[fernando] - Modify build instructions for firefox-30.0 and
     52          thunderbird-24.6.0. Uncoment 'ac_add_options --enable-system-cairo'
     53          in xulrunner/firefox-30.0 and thunderbird-24.6.0. Thanks Armin K.
     54          <ulink url="&blfs-ticket-root;5160">#5160</ulink>.</para>
     55        </listitem>
     56        <listitem>
    5157          <para>[bdubbs] - Add fltk-1.3.2 to support tigervnc.</para>
    5258        </listitem>
  • x/lib/xulrunner.xml

    rb4f8b750 r0ccfdd3a  
    178178ac_add_options --disable-pulseaudio
    179179
    180 # Uncomment this line if you compiled Cairo with --enable-tee switch and want
    181 # to use it instead of the bundled one:
    182 #ac_add_options --enable-system-cairo
     180# Comment this line if you do not have Cairo installed (compiled with
     181# --enable-tee switch) and want to use the bundled one:
     182ac_add_options --enable-system-cairo
    183183
    184184# If you have not installed Yasm then uncomment this line:
  • xsoft/graphweb/firefox.xml

    rb4f8b750 r0ccfdd3a  
    189189ac_add_options --disable-pulseaudio
    190190
    191 # Uncomment this line if you compiled Cairo with --enable-tee switch and want
    192 # to use it instead of the bundled one:
    193 #ac_add_options --enable-system-cairo
     191# Comment this line if you do not have Cairo installed (compiled with
     192# --enable-tee switch) and want to use the bundled one:
     193ac_add_options --enable-system-cairo
    194194
    195195# If you have not installed Yasm then uncomment this line:
     
    257257    </para>
    258258
    259     <para>
     259<!--    <para>
    260260      If you have <emphasis>not</emphasis> linked
    261261      <application>Firefox</application> against an installed
     
    264264
    265265<screen><userinput>make -C firefox-build-dir/browser/installer</userinput></screen>
    266 
     266-->
    267267    <para>
    268268      Now, as the <systemitem class="username">root</systemitem> user, if you
     
    272272    </para>
    273273
    274 <screen role="root"><userinput>rm -rf /usr/lib/firefox-&firefox-version; &amp;&amp;
     274<!--<screen role="root"><userinput>rm -rf /usr/lib/firefox-&firefox-version; &amp;&amp;
    275275mkdir  /usr/lib/firefox-&firefox-version; &amp;&amp;
    276276
    277277tar -xvf firefox-build-dir/dist/firefox-&firefox-version;.en-US.linux-$(uname -m).tar.bz2 \
    278     -C /usr/lib/firefox-&firefox-version; --strip-components=1 &amp;&amp;
     278    -C /usr/lib/firefox-&firefox-version; -\-strip-components=1 &amp;&amp;
    279279chown -R -v root:root /usr/lib/firefox-&firefox-version; &amp;&amp;
    280280
    281 ln -sfv ../lib/firefox-&firefox-version;/firefox /usr/bin &amp;&amp;
     281ln -sfv ../lib/firefox-&firefox-version;/firefox /usr/bin &amp;&amp;-->
     282<screen role="root"><userinput>make -f client.mk install INSTALL_SDK= &amp;&amp;
    282283
    283284mkdir -pv /usr/lib/mozilla/plugins &amp;&amp;
     
    314315      <command>make</command> uses the <filename>client.mk</filename> file to
    315316      get initial configuration and setup parameters.
    316     </para>
    317 
    318     <para>
    319       <command>make -C firefox-build-dir/browser/installer</command>: this
    320       creates a <application>Firefox</application> tarball similar to the ones
    321       you can download from Mozilla.
    322     </para>
    323 
    324     <para>
    325       <command>tar -xfv firefox-build-dir/dist ...</command>: This untars
    326       <application>Firefox</application> in /usr/lib. The
    327       <option>--strip-components=1</option> option removes the leading
    328       'firefox' directory from the filenames, allowing us to untar it
    329       into a versioned directory.
    330317    </para>
    331318
  • xsoft/other/thunderbird.xml

    rb4f8b750 r0ccfdd3a  
    162162#ac_add_options --enable-startup-notification
    163163
    164 # Uncomment this line if you compiled Cairo with --enable-tee switch and want
    165 # to use it instead of the bundled one:
    166 #ac_add_options --enable-system-cairo
     164# Comment this line if you do not have Cairo installed (compiled with
     165# --enable-tee switch) and want to use the bundled one:
     166ac_add_options --enable-system-cairo
    167167
    168168# If you have not installed Yasm then uncomment this line:
     
    219219    <note><para>
    220220      If you are compiling <application>Thunderbird</application> in chroot,
    221       prepend <envar>SHELL=/bin/bash</envar> to the first make command below.
     221      prepend <envar>SHELL=/bin/bash</envar> to the <!--first -->make command below.
    222222    </para></note>
    223223
    224 <screen><userinput>make -f client.mk &amp;&amp;
    225 make -C thunderbuild/mail/installer</userinput></screen>
     224<screen><userinput>make -f client.mk &amp;&amp;<!--
     225make -C thunderbuild/mail/installer--></userinput></screen>
    226226
    227227    <para>
     
    234234    </para>
    235235
    236 <screen role="root"><userinput>mkdir -pv /usr/lib/thunderbird-&thunderbird-version; &amp;&amp;
     236<!--<screen role="root"><userinput>mkdir -pv /usr/lib/thunderbird-&thunderbird-version; &amp;&amp;
    237237tar -xvf thunderbuild/mozilla/dist/thunderbird-&thunderbird-version;.en-US.linux-$(uname -m).tar.bz2 \
    238     -C /usr/lib/thunderbird-&thunderbird-version; --strip-components=1 &amp;&amp;
    239 ln -sfv ../lib/thunderbird-&thunderbird-version;/thunderbird /usr/bin</userinput></screen>
    240 
    241     <para>
    242       The above instructions just install the parts you need to run
     238    -C /usr/lib/thunderbird-&thunderbird-version; -\-strip-components=1 &amp;&amp;
     239ln -sfv ../lib/thunderbird-&thunderbird-version;/thunderbird /usr/bin</userinput></screen>-->
     240
     241<screen role="root"><userinput>make -f client.mk install INSTALL_SDK=</userinput></screen>
     242
     243    <para>
     244      The above instruction just installs the parts you need to run
    243245      <application>Thunderbird</application>. Alternatively, if you want to
    244246      install the full <application>Thunderbird</application> development
     
    261263    </para>
    262264
    263     <para>
    264       <command>make -C thunderbuild/mail/installer</command>: this runs make in
    265       the <filename class="directory">thunderbuild/mail/installer</filename>
    266       folder. This gathers together all the parts of
    267       <application>Thunderbird</application> and compresses them into a tarball.
    268     </para>
    269 
    270     <para>
    271       <command>tar -xfv thunderbuild/mozilla/dist ...</command>: This untars
    272       <application>Thunderbird</application>, the <option>-C</option> option
    273       uncompresses the files in
    274       <filename class="directory">/usr/lib/thunderbird-&thunderbird-version;</filename>.
    275       The <option>--strip-components=1</option> option removes the leading
    276       'thunderbird' directory from the filenames, allowing us to untar it into a
    277       versioned directory.
    278     </para>
    279265  </sect2>
    280266
Note: See TracChangeset for help on using the changeset viewer.