Changeset 69d1a8e for xsoft/graphweb/seamonkey.xml

Timestamp:

03/31/2020 02:23:02 AM (3 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, ken/inkscape-core-mods, lazarus, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226

Children:

876948d

Parents:

73db5703

Message:

Update to rustc-1.42.0 to again use system llvm for a smaller build,
but indicate why system llvm is a bad idea if using earlier llvm.
Patch seamonkey for this rustc version, its build is much slower.

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

File:

• xsoft/graphweb/seamonkey.xml (modified) (5 diffs)

xsoft/graphweb/seamonkey.xml

@@ -10 +10 @@
   <!ENTITY seamonkey-size          "277 MB">
   <!ENTITY seamonkey-buildsize     "6.9 GB (154 MB installed)">
-  <!ENTITY seamonkey-time          "19 SBU (on a 4-core machine)">
+  <!ENTITY seamonkey-time          "29 SBU (on a 4-core machine)">
 ]>
 
@@ -80 +80 @@
       </listitem>
     </itemizedlist>
-<!--
+
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
         <para>
-          Required patch if using gcc-6 or later
-          <ulink url="&patch-root;/seamonkey-&seamonkey-version;-gcc6-1.patch"/>
+          Required patch for building with rustc &gt;= 1.41
+          <ulink url="&patch-root;/seamonkey-&seamonkey-version;-rust_fixes-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
--->
+
     <note>
       <para>
@@ -262 +262 @@
     </para></note>
 
+    <para>
+      Apply the patch to allow seamonkey to build with the current version of
+      <command>rustc</command>:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../seamonkey-&seamonkey-version;-rust_fixes-1.patch</userinput></screen>
+
     <!--
     <para>
@@ -279 +286 @@
 
 <screen><userinput>sed -i -e '/pid_t gettid/,+3 s@^@//@' mozilla/tools/profiler/core/platform.h</userinput></screen>
-
-    <para>
-      Now adapt the code for a change introduced in rustc-1.39.0:
-    </para>
-
-<screen><userinput>sed -i '/deny(warnings)/d' mozilla/xpcom/rust/nsstring/src/lib.rs</userinput></screen>
 
     <!-- Doesn't seem to be needed anymore with 2.53.1
@@ -368 +369 @@
     </para>
 -->
-    <para>
-      <command>sed -i '/deny(warnings)/d' ...</command> : rust-1.39 deprecated
-      the "try!" call in favour of "?" which causes warnings, nsstring was
-      treating warnings as errors.
-    </para>
-
     <para>
       <command>make -f client.mk</command>: Mozilla products are packaged to