From 8ab71b62cfbd77e0b0aa93b60d79fa04777496c8 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  |  1 +
 debian/control    | 10 ++++++++++
 debian/control.in | 10 ++++++++++
 debian/rules      |  7 +++++--
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f780270a..f3a10a2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ llvm-toolchain-18 (1:18.1.0~rc2-4) UNRELEASED; 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
+  * Add a new package libllvmlibc-18-dev to ship LLVM libc (experimental for now)
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 19 Feb 2024 16:21:34 +0100
 
diff --git a/debian/control b/debian/control
index f6cdae61..24e736c9 100644
--- a/debian/control
+++ b/debian/control
@@ -952,3 +952,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 d47e0cc4..b785ad23 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -952,3 +952,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 6f4f3fe7..9adb73af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 # polly & lldb aren't enabled for every platform
 PROJECTS = clang;clang-tools-extra;lld;cross-project-tests;mlir
 # openmp & libunwind aren't enabled for every platform
-RUNTIMES = compiler-rt;libcxx;libcxxabi
+RUNTIMES = compiler-rt;libcxx;libcxxabi;libc
 
 TARGET_BUILD	:= build-llvm
 TARGET_BUILD_STAGE2    := $(TARGET_BUILD)/tools/clang/stage2-bins
@@ -553,7 +553,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)
@@ -1473,6 +1473,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