Changeset 882979cd for general

Timestamp:

12/03/2023 06:35:25 PM (7 months ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

12.1, ken/TL2024, lazarus, plabs/newcss, python3.11, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18

Children:

664f94b

Parents:

ee66136 (diff), f6b87643 (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' into renodr/vulkan-addition

Location:

general

Files:

• genutils/highlight.xml (modified) (1 diff)
• prog/cmake.xml (modified) (1 diff)
• prog/llvm.xml (modified) (5 diffs)

general/genutils/highlight.xml

@@ -10 +10 @@
   <!ENTITY highlight-size          "1.4 MB">
   <!ENTITY highlight-buildsize     "24 MB (with gui)">
-  <!ENTITY highlight-time          "0.3 SBU (Using paralllelism=4; with gui)">
+  <!ENTITY highlight-time          "0.3 SBU (Using parallelism=4; with gui)">
 ]>
 

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        "df0e65607c9280a8df68b2c93eac4437">
-  <!ENTITY cmake-size          "10.5 MB">
+  <!ENTITY cmake-md5sum        "d8c5c2a764229f61a4ed1e06498a6031">
+  <!ENTITY cmake-size          "10 MB">
   <!ENTITY cmake-buildsize     "424 MB (add 1.2 GB for tests)">
   <!ENTITY cmake-time          "2.2 SBU (add 3.9 SBU for tests, both using parallelism=4)">

general/prog/llvm.xml

@@ -9 +9 @@
   <!ENTITY llvm-download-http "&llvm-url;/llvm-&llvm-version;.src.tar.xz">
   <!ENTITY llvm-download-ftp  " ">
-  <!ENTITY llvm-md5sum        "78e1fbd14517f31f921b3224c0cd4e45">
+  <!ENTITY llvm-md5sum        "fd7fc891907e14f8e0ff7e3f87cc89a4">
   <!ENTITY llvm-size          "57 MB">
   <!ENTITY llvm-buildsize     "4.2 GB (964 MB installed; add 20 GB for tests and 308 MB for documentation)">
@@ -15 +15 @@
 
   <!ENTITY clang-download-http "&llvm-url;/clang-&llvm-version;.src.tar.xz">
-  <!ENTITY clang-md5sum        "469238335351f47893c665cc0fdbfcb6">
+  <!ENTITY clang-md5sum        "52ff9f49e064860445474aa21e4a7e40">
   <!ENTITY clang-size          "21 MB">
 
   <!ENTITY compiler-rt-download-http "&llvm-url;/compiler-rt-&llvm-version;.src.tar.xz">
-  <!ENTITY compiler-rt-md5sum        "295430747ca56dd2e2ab1c1a33c1ea3f">
+  <!ENTITY compiler-rt-md5sum        "85d25f04cbc4c1a20e3a1ab2a2c522cd">
   <!ENTITY compiler-rt-size          "2.4 MB">
 
@@ -311 +311 @@
 cd       build &amp;&amp;
 
-CC=gcc CXX=g++                                  \
-cmake -DCMAKE_INSTALL_PREFIX=/usr               \
-      -DLLVM_ENABLE_FFI=ON                      \
-      -DCMAKE_BUILD_TYPE=Release                \
-      -DLLVM_BUILD_LLVM_DYLIB=ON                \
-      -DLLVM_LINK_LLVM_DYLIB=ON                 \
-      -DLLVM_ENABLE_RTTI=ON                     \
-      -DLLVM_TARGETS_TO_BUILD="host;AMDGPU;BPF" \
-      -DLLVM_BINUTILS_INCDIR=/usr/include       \
-      -DLLVM_INCLUDE_BENCHMARKS=OFF             \
-      -DCLANG_DEFAULT_PIE_ON_LINUX=ON           \
-      -Wno-dev -G Ninja ..                      &amp;&amp;
+CC=gcc CXX=g++                              \
+cmake -DCMAKE_INSTALL_PREFIX=/usr           \
+      -DLLVM_ENABLE_FFI=ON                  \
+      -DCMAKE_BUILD_TYPE=Release            \
+      -DLLVM_BUILD_LLVM_DYLIB=ON            \
+      -DLLVM_LINK_LLVM_DYLIB=ON             \
+      -DLLVM_ENABLE_RTTI=ON                 \
+      -DLLVM_TARGETS_TO_BUILD="host;AMDGPU" \
+      -DLLVM_BINUTILS_INCDIR=/usr/include   \
+      -DLLVM_INCLUDE_BENCHMARKS=OFF         \
+      -DCLANG_DEFAULT_PIE_ON_LINUX=ON       \
+      -Wno-dev -G Ninja ..                  &amp;&amp;
 ninja</userinput></screen>
 
@@ -342 +342 @@
 
 <screen remap="doc"><userinput>ninja docs-clang-html docs-clang-man</userinput></screen>
+
+    <!-- https://github.com/llvm/llvm-project/issues/39012 -->
+    <para>
+      If you wish to run the tests, remove a test case known to hang
+      indefinitely on some systems:
+    </para>
+
+    <screen remap='test'><userinput>rm -f ../projects/compiler-rt/test/tsan/getline_nohang.cpp</userinput></screen>
 
     <!-- The excessive core dump made my system irresponsive.  -->
@@ -466 +474 @@
 
     <para>
-      <parameter>-DLLVM_TARGETS_TO_BUILD="host;AMDGPU;BPF"</parameter>: This
+      <parameter>-DLLVM_TARGETS_TO_BUILD="host;AMDGPU"</parameter>: This
       switch enables building for the same target as the host, and also for
-      the r600 AMD GPU used by the Mesa r600 and radeonsi drivers. The BPF
-      target is required to build <xref linkend="v4l-utils"/>. The Default is
+      the r600 AMD GPU used by the Mesa r600 and radeonsi drivers.
+      The default is
       all of the targets. You can use a semicolon separated list. Valid targets
       are: host, X86, Sparc, PowerPC, ARM, AArch64, Mips, Hexagon, Xcore,