From 4db9f7c5938247546f97976e8f0a4dd3f49e2244 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 20 Feb 2024 22:42:46 +0100
Subject: [PATCH] Add a new package libllvmlibc-18-dev to ship LLVM libc
 (experimental for now)

---
 debian/changelog  | 11 +++++++++++
 debian/control    | 10 ++++++++++
 debian/control.in | 10 ++++++++++
 debian/rules      |  5 ++++-
 4 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f656e29c..3e601228 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,7 @@ 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
@@ -53,6 +54,16 @@ llvm-toolchain-18 (1:18.1.0~rc2-4) unstable; urgency=medium
   [ 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
+=======
+  [ 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
+  * Add a new package libllvmlibc-18-dev to ship LLVM libc (experimental for now)
+>>>>>>>
 
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 09 Feb 2024 20:59:07 +0100
 
diff --git a/debian/control b/debian/control
index 9d71ef75..e1879ac0 100644
--- a/debian/control
+++ b/debian/control
@@ -956,3 +956,13 @@ Description: Flang library - Development package
  of examples, some functionalities are still missing.
  .
  This package contains the flang libraries and headers.
+
+# ------------- LLVM libc -------------
+
+Package: libllvmlibc-18-dev
+Section: libdevel
+Architecture: any
+Description: LLVM C Library - dev package
+ Implementation of the C standard library targeting C17 and above.
+ .
+ This is an experimental project. Don't use in production.
diff --git a/debian/control.in b/debian/control.in
index 94402b28..df9b6180 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -956,3 +956,13 @@ Description: Flang library - Development package
  of examples, some functionalities are still missing.
  .
  This package contains the flang libraries and headers.
+
+# ------------- LLVM libc -------------
+
+Package: libllvmlibc-@LLVM_VERSION@-dev
+Section: libdevel
+Architecture: any
+Description: LLVM C Library - dev package
+ Implementation of the C standard library targeting C17 and above.
+ .
+ This is an experimental project. Don't use in production.
diff --git a/debian/rules b/debian/rules
index a76db1d4..585c96db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -563,7 +563,7 @@ ifneq (,$(filter coverity,$(DEB_BUILD_OPTIONS)))
 endif
 
 # enables cmake build targets like stage2-[target_name]
-ENABLED_STAGE2_CMAKE_BUILD_TARGETS = check-all;check-llvm;check-clang;check-clang-tools;check-lld;check-libcxx;check-libcxxabi;check-mlir;check-sanitizer;llvm-config;test-suite
+ENABLED_STAGE2_CMAKE_BUILD_TARGETS = check-all;check-llvm;check-clang;check-clang-tools;check-lld;check-libcxx;check-libcxxabi;check-mlir;check-libc;check-sanitizer;llvm-config;test-suite
 
 %:
 	dh $@ $(DH_OPTIONS)
@@ -1484,6 +1484,9 @@ endif
 # Libcxx
 	ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-libcxx || true
 
+# Libc
+	ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-libc || true
+
 # Libcxxabi
 	ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-libcxxabi || true