Changes in general/prog/cmake.xml [80a893e:d1901e49]

File:

• general/prog/cmake.xml (modified) (8 diffs)

general/prog/cmake.xml

@@ -7 +7 @@
   <!ENTITY cmake-download-http "https://cmake.org/files/v&cmake-major-version;/cmake-&cmake-version;.tar.gz">
   <!ENTITY cmake-download-ftp  " ">
-  <!ENTITY cmake-md5sum        "ea7ca1fe24011736de2d3a08ae15ff36">
-  <!ENTITY cmake-size          "9.3 MB">
-  <!ENTITY cmake-buildsize     "333 MB (add 981 MB for tests)">
-  <!ENTITY cmake-time          "2.1 SBU (add 3.7 SBU for tests, both using parallelism=4)">
+  <!ENTITY cmake-md5sum        "521a03b1c36412463eda0348bebf4765">
+  <!ENTITY cmake-size          "10 MB">
+  <!ENTITY cmake-buildsize     "432 MB (add 1.1 GB for tests)">
+  <!ENTITY cmake-time          "2.3 SBU (add 3.6 SBU for tests, both using parallelism=4)">
 ]>
 
@@ -16 +16 @@
   <?dbhtml filename="cmake.html"?>
 
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
 
   <title>CMake-&cmake-version;</title>
@@ -38 +35 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs112_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -80 +77 @@
         <para>
           Required patch:
-          <ulink url="&patch-root;/cmake-&cmake-version;-src_property_fix-1.patch"/>
+          <ulink url="&patch-root;/cmake-&cmake-version;-upstream_fix-1.patch"/>
         </para>
       </listitem>
@@ -87 +84 @@
 
     <bridgehead renderas="sect3">CMake Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libuv"/>
-    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="curl"/>,
-      <xref linkend="libarchive"/>, and
+      <xref linkend="libarchive"/>,
+      <xref linkend="libuv"/>, and
       <xref linkend="nghttp2"/>
     </para>
@@ -119 +112 @@
     <title>Installation of CMake</title>
 
- <!-- This patch might be included in 3.19.1 and higher
-    <para>
-      First, fix a regression that was discovered after the release of 3.19.0:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../cmake-&cmake-version;-src_property_fix-1.patch</userinput></screen>
+ <!--
+    <para>
+      First, adapt the FindBoost module to use Boost-1.80.0:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../cmake-&cmake-version;-upstream_fix-1.patch</userinput></screen>
 -->
 
@@ -149 +142 @@
       number of system cores. Setting <envar>LC_ALL</envar> is needed to
       prevent some test failures when some of the locale variables are
-      set to non English locales. Four tests: ExternalProject, CTest.UpdateHG,
-       CMakeOnly.AllFindModules, and RunCMake.CMP0125 are known to fail.
+      set to non English locales. Two tests, RunCMake.FindBoost and
+      BundleUtilities, are known to fail.
     </para>
 
@@ -201 +194 @@
       <application>librhash</application> library from the list of system
       libraries used. A bundled version of that library is used instead.
+    </para>
+
+    <para>
+      <option>--no-system-{curl,libarchive,libuv,nghttp2}</option>: Use
+      the corresponding option in the list for the
+      <command>bootstrap</command> if one recommended dependency is not
+      installed.  A bundled version of the dependency will be used instead.
     </para>