Ignore:
Timestamp:
12/18/2020 01:47:30 PM (3 years ago)
Author:
Pierre Labastie <pieere@…>
Branches:
qt5new
Children:
96f41f4
Parents:
eb30b876 (diff), 42117d4e (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 trunk up to r24000

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/qt5new@24001 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:
1 edited

Legend:

Unmodified
Added
Removed
  • general/prog/cmake.xml

    reb30b876 r1d087b41  
    77  <!ENTITY cmake-download-http "https://cmake.org/files/v&cmake-major-version;/cmake-&cmake-version;.tar.gz">
    88  <!ENTITY cmake-download-ftp  " ">
    9   <!ENTITY cmake-md5sum        "f2969ca3cf90a647c6c9f55b949f6cc1">
     9  <!ENTITY cmake-md5sum        "043d47c9a37755f3da1e8c1123e1a2dd">
    1010  <!ENTITY cmake-size          "8.8 MB">
    11   <!ENTITY cmake-buildsize     "375 MB (add 727 MB for tests)">
    12   <!ENTITY cmake-time          "2.3 SBU (add 3.4 SBU for tests, both using parallelism=4)">
     11  <!ENTITY cmake-buildsize     "352 MB (add 699 MB for tests)">
     12  <!ENTITY cmake-time          "1.7 SBU (add 3.1 SBU for tests, both using parallelism=4)">
    1313]>
    1414
     
    104104    <para role="optional">
    105105      <xref linkend="git"/> (for use during tests),
     106      <xref linkend="mercurial"/> (for use during tests),
    106107      <xref linkend="qt5"/> (for the Qt-based GUI),
    107108      <xref linkend="subversion"/> (for testing),
Note: See TracChangeset for help on using the changeset viewer.