From 7afcc291033b3d84dba4c990a6e10c8446aa42e8 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 19 Feb 2024 16:22:25 +0100 Subject: [PATCH] Ship libc++-18-dev /usr/lib/llvm-18/lib/libc++.modules.json /usr/lib/llvm-18/include/c++/v1/std.compat.cppm /usr/lib/llvm-18/include/c++/v1/std.cppm --- debian/changelog | 19 +++++++++++++++++++ debian/libc++-X.Y-dev.install.in | 9 ++++++--- debian/libllvmlibc-X.Y-dev.install.in | 1 + debian/rules | 1 + 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 debian/libllvmlibc-X.Y-dev.install.in diff --git a/debian/changelog b/debian/changelog index 1bb8986a..25ec392a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,9 +34,28 @@ llvm-toolchain-snapshot (1:19~++20240125092523+41fe98a6e7e5-1~exp1) experimental llvm-toolchain-18 (1:18.1.0~rc2-4) unstable; urgency=medium +<<<<<<< * Fix 32bit builds, exclude i386, don't build clang-rt there * Revert gold linker on mips64el * Disable stack protector on mips64el +======= + [ John Paul Adrian Glaubitz ] + * Install *clang_rt* on sparc and sparc64 + * Run chrpath for libclang on sparc and sparc64 + + [ Sylvestre Ledru ] + * add -DLIBCXX_INSTALL_MODULES=ON + see https://discourse.llvm.org/t/libc-c-23-module-installation-support/77061/1 + Ship libc++-18-dev /usr/lib/llvm-18/lib/libc++.modules.json /usr/lib/llvm-18/include/c++/v1/std.compat.cppm + /usr/lib/llvm-18/include/c++/v1/std.cppm + [ John Paul Adrian Glaubitz ] + * Install *clang_rt* on sparc and sparc64 + * Run chrpath for libclang on sparc and sparc64 + + [ Sylvestre Ledru ] + * add -DLIBCXX_INSTALL_MODULES=ON to install libc++ C++-20 modules + see https://discourse.llvm.org/t/libc-c-23-module-installation-support/77061/1 +>>>>>>> -- Gianfranco Costamagna Fri, 09 Feb 2024 20:59:07 +0100 diff --git a/debian/libc++-X.Y-dev.install.in b/debian/libc++-X.Y-dev.install.in index 208e5daf..1a4d26ee 100644 --- a/debian/libc++-X.Y-dev.install.in +++ b/debian/libc++-X.Y-dev.install.in @@ -3,6 +3,9 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libc++.a usr/lib/llvm-@LLVM_VERSION@/include/c++/ usr/lib/llvm-@LLVM_VERSION@/include/c++/v1/ usr/lib/llvm-@LLVM_VERSION@/lib/libc++experimental.a -build-llvm/modules/c++/v1/std.cppm usr/lib/llvm-@LLVM_VERSION@/include/c++/v1/ -build-llvm/modules/c++/v1/std.compat.cppm usr/lib/llvm-@LLVM_VERSION@/include/c++/v1/ -build-llvm/lib/libc++.modules.json usr/lib/llvm-@LLVM_VERSION@/lib/ + +# C++ modules +usr/lib/llvm-@LLVM_VERSION@/lib/libc++.modules.json +usr/lib/llvm-@LLVM_VERSION@/share/libc++/v1/std.compat/*.inc +usr/lib/llvm-@LLVM_VERSION@/share/libc++/v1/*.cppm +usr/lib/llvm-@LLVM_VERSION@/share/libc++/v1/std/*.inc diff --git a/debian/libllvmlibc-X.Y-dev.install.in b/debian/libllvmlibc-X.Y-dev.install.in new file mode 100644 index 00000000..cd6c1add --- /dev/null +++ b/debian/libllvmlibc-X.Y-dev.install.in @@ -0,0 +1 @@ +usr/lib/llvm-@LLVM_VERSION@/lib/libllvmlibc.a diff --git a/debian/rules b/debian/rules index 0a7c37ff..a76db1d4 100755 --- a/debian/rules +++ b/debian/rules @@ -792,6 +792,7 @@ endif -DLIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY=OFF \ -DLIBCXX_INSTALL_LIBRARY=OFF \ -DLIBCXX_INSTALL_MODULES=ON \ + -DBOOTSTRAP_LIBCXX_INSTALL_MODULES=ON \ -DOPENMP_ENABLE_LIBOMP_PROFILING=OFF \ -DOPENMP_ENABLE_LIBOMPTARGET_PROFILING=OFF \ -DLIBOMP_ENABLE_RTTI=OFF \