Changeset 014a25a7


Ignore:
Timestamp:
06/30/2022 04:14:48 AM (3 months ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
11.2, trunk, xry111/soup3
Children:
8d2bafa9
Parents:
30fb348 (diff), 45d03f93 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'trunk' of git.linuxfromscratch.org:blfs into trunk

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • introduction/welcome/changelog.xml

    r30fb348 r014a25a7  
    5252          <para>[bdubbs] - Update to python-dbusmock-0.28.1 (Python module). Fixes
    5353          <ulink url="&blfs-ticket-root;16713">#16713</ulink>.</para>
     54        </listitem>
     55        <listitem>
     56          <para>[ken] - Update to thunderbird-102.0 (security fix) and use
     57          clang for it. Fixes <ulink url="&blfs-ticket-root;16712">#16712</ulink>.
     58          If updating from thunderbird-91 series, please check that ticket for
     59          dependency updates and build changes. This completes
     60          <ulink url="&blfs-ticket-root;16697">#16697</ulink>.</para>
    5461        </listitem>
    5562      </itemizedlist>
  • packages.ent

    r30fb348 r014a25a7  
    985985<!ENTITY rox-filer-version            "2.11">
    986986<!ENTITY rxvt-unicode-version         "9.30">
    987 <!ENTITY thunderbird-version          "91.10.0">
     987<!ENTITY thunderbird-version          "102.0">
    988988<!ENTITY tigervnc-version             "1.12.0">
    989989<!ENTITY transmission-version         "3.00">
  • xsoft/graphweb/firefox.xml

    r30fb348 r014a25a7  
    251251ac_add_options --with-system-webp
    252252
    253 # Do not specify the gold linker which is not the default. It will take
    254 # longer and use more disk space when debug symbols are disabled.
     253# Unlike with thunderbird, although using the gold linker can
     254# save four megabytes in the installed file it does not make
     255# the build faster.
    255256
    256257# libdavid (av1 decoder) requires nasm. Uncomment this if nasm
  • xsoft/other/thunderbird.xml

    r30fb348 r014a25a7  
    77  <!ENTITY thunderbird-download-http "&mozilla-http;/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;.source.tar.xz">
    88  <!ENTITY thunderbird-download-ftp  " ">
    9   <!ENTITY thunderbird-md5sum        "3595b4a1e6422dc70f48a2a19411784b">
    10   <!ENTITY thunderbird-size          "395 MB">
    11   <!ENTITY thunderbird-buildsize     "7.0 GB (200 MB installed)">
    12   <!ENTITY thunderbird-time          "26 SBU (on a 4-core machine)">
     9  <!ENTITY thunderbird-md5sum        "fc033aefff22c745284c12d648affa1d">
     10  <!ENTITY thunderbird-size          "480 MB">
     11  <!ENTITY thunderbird-buildsize     "7.4 GB (202 MB installed)">
     12  <!ENTITY thunderbird-time          "25 SBU (on a 4-core machine)">
    1313  <!-- Removed the -j1 time because python and rust do not obey it, although
    1414       the C/C++ code appears to obey it -->
     
    7373    </itemizedlist>
    7474
    75     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     75<!--<bridgehead renderas="sect3">Additional Downloads</bridgehead>
    7676    <itemizedlist spacing="compact">
    7777      <listitem>
     
    8181        </para>
    8282      </listitem>
    83     </itemizedlist>
     83    </itemizedlist>-->
    8484
    8585    <bridgehead renderas="sect3">Thunderbird Dependencies</bridgehead>
     
    108108      <xref linkend="icu"/>,
    109109      <xref linkend="libevent"/>,
    110 <!-- Fails to build with version 1.8.0
    111       <xref linkend="libvpx"/>,-->
     110      <xref linkend="libvpx"/>,
    112111      <xref linkend="nasm"/>,
    113112      <xref linkend="nspr"/>, and
     
    183182# recommended dependencies:
    184183ac_add_options --with-system-libevent
     184ac_add_options --with-system-libvpx
    185185ac_add_options --with-system-nspr
    186186ac_add_options --with-system-nss
     
    218218
    219219
    220     <para>
     220<!--<para>
    221221      Apply a patch which allows compilation on systems with gcc-12:
    222222    </para>
    223223
    224 <screen><userinput remap="pre">patch -Np1 -i ../thunderbird-&thunderbird-version;-gcc12_fix-1.patch</userinput></screen>
     224<screen><userinput remap="pre">patch -Np1 -i ../thunderbird-&thunderbird-version;-gcc12_fix-1.patch</userinput></screen>-->
    225225
    226226    <para>
     
    234234<!-- applying this for 11.1: upstream haven't make their mind yet
    235235     https://bugzilla.mozilla.org/show_bug.cgi?id=1729459
    236      Still not fixed in 91.9.0. -->
     236     Still not fixed in 102.0. -->
    237237    <para>
    238238      If building on a 32 bit machine, the following sed works around
     
    260260    </note>
    261261
    262 <screen><userinput>export CC=gcc CXX=g++ &amp;&amp;
    263 export MACH_USE_SYSTEM_PYTHON=1 &amp;&amp;
    264 ./mach configure      &amp;&amp;
     262<screen><userinput>export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system &amp;&amp;
     263./mach configure                                      &amp;&amp;
    265264./mach build</userinput></screen>
    266265
     
    274273    </para>
    275274
    276 <screen role="root"><userinput>MACH_USE_SYSTEM_PYTHON=1 ./mach install</userinput></screen>
     275<screen role="root"><userinput>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system ./mach install</userinput></screen>
    277276<!-- devs: For DESTDIR install, prepend DESTDIR=<dest> to the above -->
    278277    <para>
     
    280279    </para>
    281280
    282 <screen><userinput>unset CC CXX MACH_USE_SYSTEM_PYTHON</userinput></screen>
     281<screen><userinput>unset CC CXX MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE</userinput></screen>
    283282
    284283  </sect2>
     
    295294
    296295    <para>
    297       <command>CC=gcc CXX=g++ ./mach configure</command>:
    298       <application>Thunderbird</application>
    299       now uses this <application>python3</application> script to run the
    300       configuration,
    301       build and install. Forcing GCC causes the build to come out smaller
    302       and run faster.
    303       <!-- For more info, see Ticket #13969. ~12GB to ~5GB build size,
    304       significantly smaller build time.-->
    305     </para>
    306 
    307     <para>
    308       <command>MACH_USE_SYSTEM_PYTHON=1</command>: Use the system python
    309       to create a virtual environment for <command>mach</command> without
    310       downloading any python wheels.
     296      <command>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system</command>: Use the
     297      system python to create a virtual environment for <command>mach</command>
     298      without downloading any python wheels.
     299    </para>
     300
     301    <para>
     302      <command>./mach configure</command>: This validates the supplied
     303      dependencies and the <filename>mozconfig</filename>.
    311304    </para>
    312305
     
    315308      need details of which files are being compiled, together with any C or
    316309      C++ flags being used.
     310    </para>
     311
     312    <para>
     313      <option>./mach build -jN</option>: The build should, by default, use
     314      all the online CPU cores. If using all the cores causes the build to swap
     315      because you have insufficient memory, using fewer cores can be faster.
     316    </para>
     317
     318    <para>
     319      <parameter><envar>CC=gcc CXX=g++</envar></parameter>: BLFS used to
     320      prefer to use gcc and g++ instead of upstream's defaults of the
     321      <application>clang</application> programs. With the release of
     322      gcc-12 the build takes longer with gcc and g++, primarily because
     323      of extra warnings, and is bigger. Set these environment variables
     324      <emphasis>before you run the configure script</emphasis>
     325      if you wish to continue to use gcc, g++.
    317326    </para>
    318327
Note: See TracChangeset for help on using the changeset viewer.