Skip to contentSkip to conversation

apt: Fix build with llvm libc++

PATCH In review Khem Raj 2 participants 2 messages Sep 11, 2025

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 apt: Fix build with llvm libc++

Clang finds more problems when compiling apt with libc++ for c++ runtime.

Cc Gyorgy Sarvari <[email protected]>
---
 ...sic_string_view-unsigned-char-in-Hex.patch |  68 ++++++++
 ...r-Var-before-std-queue-members-to-sa.patch | 163 ++++++++++++++++++
 meta/recipes-devtools/apt/apt_3.0.3.bb        |   4 +
 3 files changed, 235 insertions(+)
 create mode 100644 meta/recipes-devtools/apt/apt/0001-apt-avoid-std-basic_string_view-unsigned-char-in-Hex.patch
 create mode 100644 meta/recipes-devtools/apt/apt/0001-apt-define-Solver-Var-before-std-queue-members-to-sa.patch
meta/recipes-devtools/apt/apt/0001-apt-avoid-std-basic_string_view-unsigned-char-in-Hex.patch new file +68 -0
new file mode 100644
index 00000000000..03307364ab7
@@ -0,0 +1,68 @@
+From 9cc3b306093cf762e23d3a8611f2ad12cfe4b960 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Wed, 10 Sep 2025 16:02:37 -0700
+Subject: [PATCH] apt: avoid std::basic_string_view<unsigned char> in HexDigest
+ for libc++
+
+LLVM libc++ 18+ removed the generic std::char_traits<T> template [1], so
+instantiating std::basic_string_view<unsigned char> no longer compiles.
+HexDigest previously took a basic_string_view<unsigned char> and relied
+on this unsupported instantiation.
+
+Switch HexDigest to take a raw unsigned char* with explicit size,
+and update its caller in PrivateHashes::HexDigest accordingly.
+The conversion loop is unchanged, but the implementation is simplified
+using a constexpr hex digit table.
+
+This fixes build failures with recent libc++ while preserving existing
+behavior.
+
+[1] https://github.com/llvm/llvm-project/commit/e30a148b098d462d0267c479cd9e4783363c2761
+
+Upstream-Status: Submitted [https://salsa.debian.org/apt-team/apt/-/merge_requests/511]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ apt-pkg/contrib/hashes.cc | 21 ++++++++-------------
+ 1 file changed, 8 insertions(+), 13 deletions(-)
+
+diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
+index 9c0ce40..74b4d5f 100644
+--- a/apt-pkg/contrib/hashes.cc
++++ b/apt-pkg/contrib/hashes.cc
+@@ -296,20 +296,15 @@ bool HashStringList::operator!=(HashStringList const &other) const
+    return !(*this == other);
+ }
+ 									/*}}}*/
+-static APT_PURE std::string HexDigest(std::basic_string_view<unsigned char> const &Sum)
++static APT_PURE std::string HexDigest(unsigned char const* data, size_t size)
+ {
+-   char Conv[16] =
+-      {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b',
+-       'c', 'd', 'e', 'f'};
+-   std::string Result(Sum.size() * 2, 0);
+-
++   static constexpr char Conv[] = "0123456789abcdef";
++   std::string Result(size * 2, 0);
+    // Convert each char into two letters
+-   size_t J = 0;
+-   size_t I = 0;
+-   for (; I != (Sum.size()) * 2; J++, I += 2)
+-   {
+-      Result[I] = Conv[Sum[J] >> 4];
+-      Result[I + 1] = Conv[Sum[J] & 0xF];
++   for (size_t j = 0, i = 0; j < size; ++j, i += 2) {
++      unsigned char b = data[j];
++      Result[i]     = Conv[(b >> 4) & 0xF];
++      Result[i + 1] = Conv[b & 0xF];
+    }
+    return Result;
+ };
+@@ -360,7 +355,7 @@ class PrivateHashes
+       EVP_DigestFinal_ex(tmpContext, Sum, nullptr);
+       EVP_MD_CTX_destroy(tmpContext);
+ 
+-      return ::HexDigest(std::basic_string_view<unsigned char>(Sum, Size));
++      return ::HexDigest(Sum, static_cast<size_t>(Size));
+    }
+ 
+    bool Enable(HashAlgo const &algo)
meta/recipes-devtools/apt/apt/0001-apt-define-Solver-Var-before-std-queue-members-to-sa.patch new file +163 -0

163 lines not on this page · raw message

meta/recipes-devtools/apt/apt_3.0.3.bb +4 -0
index 03a6869393b..666e059cccc 100644
@@ -11,6 +11,8 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/${BPN}_${PV}.tar.xz \
            file://0001-CMakeLists.txt-avoid-changing-install-paths-based-on.patch \
            file://0001-cmake-Do-not-build-po-files.patch \
            file://0001-fix-compilation-with-musl.patch \
+           file://0001-apt-avoid-std-basic_string_view-unsigned-char-in-Hex.patch \
+           file://0001-apt-define-Solver-Var-before-std-queue-members-to-sa.patch \
            "
 
 SRC_URI:append:class-native = " \
@@ -34,6 +36,8 @@ UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/apt/"
 # to express 'divisible by 4 plus 2' in regex (that I know of), let's hardcode a few.
 UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>((2\.2)|(2\.6)|(3\.0)|(3\.4)|(3\.8)|(4\.2))(\.\d+)+)\.tar"
 
+CXXFLAGS += "-Wno-unknown-attributes -Wno-vla-cxx-extension -Wno-misleading-indentation -Wno-unused-private-field"
+
 inherit cmake perlnative bash-completion useradd
 
 # User is added to allow apt to drop privs, will runtime warn without
#1 lore raw

Sorry, wasn't fast enough - thank you for taking care of this.

Quoted 278 lines · Khem Raj

Clang finds more problems when compiling apt with libc++ for c++ runtime.

Cc Gyorgy Sarvari <[email protected]>
---
 ...sic_string_view-unsigned-char-in-Hex.patch |  68 ++++++++
 ...r-Var-before-std-queue-members-to-sa.patch | 163 ++++++++++++++++++
 meta/recipes-devtools/apt/apt_3.0.3.bb        |   4 +
 3 files changed, 235 insertions(+)
 create mode 100644 meta/recipes-devtools/apt/apt/0001-apt-avoid-std-basic_string_view-unsigned-char-in-Hex.patch
 create mode 100644 meta/recipes-devtools/apt/apt/0001-apt-define-Solver-Var-before-std-queue-members-to-sa.patch
meta/recipes-devtools/apt/apt/0001-apt-avoid-std-basic_string_view-unsigned-char-in-Hex.patch new file +68 -0
new file mode 100644
index 00000000000..03307364ab7
@@ -0,0 +1,68 @@
+From 9cc3b306093cf762e23d3a8611f2ad12cfe4b960 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Wed, 10 Sep 2025 16:02:37 -0700
+Subject: [PATCH] apt: avoid std::basic_string_view<unsigned char> in HexDigest
+ for libc++
+
+LLVM libc++ 18+ removed the generic std::char_traits<T> template [1], so
+instantiating std::basic_string_view<unsigned char> no longer compiles.
+HexDigest previously took a basic_string_view<unsigned char> and relied
+on this unsupported instantiation.
+
+Switch HexDigest to take a raw unsigned char* with explicit size,
+and update its caller in PrivateHashes::HexDigest accordingly.
+The conversion loop is unchanged, but the implementation is simplified
+using a constexpr hex digit table.
+
+This fixes build failures with recent libc++ while preserving existing
+behavior.
+
+[1] https://github.com/llvm/llvm-project/commit/e30a148b098d462d0267c479cd9e4783363c2761
+
+Upstream-Status: Submitted [https://salsa.debian.org/apt-team/apt/-/merge_requests/511]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ apt-pkg/contrib/hashes.cc | 21 ++++++++-------------
+ 1 file changed, 8 insertions(+), 13 deletions(-)
+
+diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
+index 9c0ce40..74b4d5f 100644
+--- a/apt-pkg/contrib/hashes.cc
++++ b/apt-pkg/contrib/hashes.cc
+@@ -296,20 +296,15 @@ bool HashStringList::operator!=(HashStringList const &other) const
+    return !(*this == other);
+ }
+ 									/*}}}*/
+-static APT_PURE std::string HexDigest(std::basic_string_view<unsigned char> const &Sum)
++static APT_PURE std::string HexDigest(unsigned char const* data, size_t size)
+ {
+-   char Conv[16] =
+-      {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b',
+-       'c', 'd', 'e', 'f'};
+-   std::string Result(Sum.size() * 2, 0);
+-
++   static constexpr char Conv[] = "0123456789abcdef";
++   std::string Result(size * 2, 0);
+    // Convert each char into two letters
+-   size_t J = 0;
+-   size_t I = 0;
+-   for (; I != (Sum.size()) * 2; J++, I += 2)
+-   {
+-      Result[I] = Conv[Sum[J] >> 4];
+-      Result[I + 1] = Conv[Sum[J] & 0xF];
++   for (size_t j = 0, i = 0; j < size; ++j, i += 2) {
++      unsigned char b = data[j];
++      Result[i]     = Conv[(b >> 4) & 0xF];
++      Result[i + 1] = Conv[b & 0xF];
+    }
+    return Result;
+ };
+@@ -360,7 +355,7 @@ class PrivateHashes
+       EVP_DigestFinal_ex(tmpContext, Sum, nullptr);
+       EVP_MD_CTX_destroy(tmpContext);
+ 
+-      return ::HexDigest(std::basic_string_view<unsigned char>(Sum, Size));
++      return ::HexDigest(Sum, static_cast<size_t>(Size));
+    }
+ 
+    bool Enable(HashAlgo const &algo)
meta/recipes-devtools/apt/apt/0001-apt-define-Solver-Var-before-std-queue-members-to-sa.patch new file +163 -0
new file mode 100644
index 00000000000..b33d4797ad2
@@ -0,0 +1,163 @@
+From 59e7c9e118921b76ed1f8c765ce57a3aff5a32d8 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Wed, 10 Sep 2025 23:29:50 -0700
+Subject: [PATCH] apt: define Solver::Var before std::queue members to satisfy
+ libc++
+
+LLVM libc++ requires element types of std::deque/std::queue to be
+complete at the point of declaration, as sizeof(T) is used internally.
+In solver3.h, Solver::Var was only forward-declared when the
+propQ and discoverQ queues were declared, leading to a build failure:
+
+error: invalid application of 'sizeof' to an incomplete type 'APT::Solver::Var'
+
+Move the full definition of Solver::Var into the Solver class body
+above the queue members and drop the later out-of-class definition.
+This ensures Var is complete when used in std::queue.
+
+Fixes build with libc++ 18+ while preserving existing semantics.
+
+Upstream-Status: Submitted [https://salsa.debian.org/apt-team/apt/-/merge_requests/511]
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+ apt-pkg/solver3.h | 119 +++++++++++++++++++++++-----------------------
+ 1 file changed, 59 insertions(+), 60 deletions(-)
+
+diff --git a/apt-pkg/solver3.h b/apt-pkg/solver3.h
+index 6810df4..0484909 100644
+--- a/apt-pkg/solver3.h
++++ b/apt-pkg/solver3.h
+@@ -80,7 +80,65 @@ class Solver
+ {
+    enum class Decision : uint16_t;
+    enum class Hint : uint16_t;
+-   struct Var;
++/**
++ * \brief Tagged union holding either a package, version, or nothing; representing the reason for installing something.
++ *
++ * We want to keep track of the reason why things are being installed such that
++ * we can have sensible debugging abilities; and we want to generically refer to
++ * both packages and versions as variables, hence this class was added.
++ *
++ */
++   struct Var
++   {
++      uint32_t value;
++
++      explicit constexpr Var(uint32_t value = 0) : value{value} {}
++      explicit Var(pkgCache::PkgIterator const &Pkg) : value(uint32_t(Pkg.MapPointer()) << 1) {}
++      explicit Var(pkgCache::VerIterator const &Ver) : value(uint32_t(Ver.MapPointer()) << 1 | 1) {}
++
++      inline constexpr bool isVersion() const { return value & 1; }
++      inline constexpr uint32_t mapPtr() const { return value >> 1; }
++
++      // \brief Return the package, if any, otherwise 0.
++      map_pointer<pkgCache::Package> Pkg() const
++      {
++         return isVersion() ? 0 : map_pointer<pkgCache::Package>{mapPtr()};
++      }
++      // \brief Return the version, if any, otherwise 0.
++      map_pointer<pkgCache::Version> Ver() const
++      {
++         return isVersion() ? map_pointer<pkgCache::Version>{mapPtr()} : 0;
++      }
++      // \brief Return the package iterator if storing a package, or an empty one
++      pkgCache::PkgIterator Pkg(pkgCache &cache) const
++      {
++         return isVersion() ? pkgCache::PkgIterator() : pkgCache::PkgIterator(cache, cache.PkgP + Pkg());
++      }
++      // \brief Return the version iterator if storing a package, or an empty end.
++      pkgCache::VerIterator Ver(pkgCache &cache) const
++      {
++         return isVersion() ? pkgCache::VerIterator(cache, cache.VerP + Ver()) : pkgCache::VerIterator();
++      }
++      // \brief Return a package, cast from version if needed
++      pkgCache::PkgIterator CastPkg(pkgCache &cache) const
++      {
++         return isVersion() ? Ver(cache).ParentPkg() : Pkg(cache);
++      }
++      // \brief Check if there is no reason.
++      constexpr bool empty() const { return value == 0; }
++      constexpr bool operator!=(Var const other) const { return value != other.value; }
++      constexpr bool operator==(Var const other) const { return value == other.value; }
++
++      std::string toString(pkgCache &cache) const
++      {
++         if (auto P = Pkg(cache); not P.end())
++	    return P.FullName();
++         if (auto V = Ver(cache); not V.end())
++	    return V.ParentPkg().FullName() + "=" + V.VerStr();
++         return "(root)";
++      }
++   };
++
+    struct CompareProviders3;
+    struct State;
+    struct Clause;
+@@ -320,65 +378,6 @@ class Solver
+ 
+ }; // namespace APT
+ 
+-/**
+- * \brief Tagged union holding either a package, version, or nothing; representing the reason for installing something.
+- *
+- * We want to keep track of the reason why things are being installed such that
+- * we can have sensible debugging abilities; and we want to generically refer to
+- * both packages and versions as variables, hence this class was added.
+- *
+- */
+-struct APT::Solver::Var
+-{
+-   uint32_t value;
+-
+-   explicit constexpr Var(uint32_t value = 0) : value{value} {}
+-   explicit Var(pkgCache::PkgIterator const &Pkg) : value(uint32_t(Pkg.MapPointer()) << 1) {}
+-   explicit Var(pkgCache::VerIterator const &Ver) : value(uint32_t(Ver.MapPointer()) << 1 | 1) {}
+-
+-   inline constexpr bool isVersion() const { return value & 1; }
+-   inline constexpr uint32_t mapPtr() const { return value >> 1; }
+-
+-   // \brief Return the package, if any, otherwise 0.
+-   map_pointer<pkgCache::Package> Pkg() const
+-   {
+-      return isVersion() ? 0 : map_pointer<pkgCache::Package>{mapPtr()};
+-   }
+-   // \brief Return the version, if any, otherwise 0.
+-   map_pointer<pkgCache::Version> Ver() const
+-   {
+-      return isVersion() ? map_pointer<pkgCache::Version>{mapPtr()} : 0;
+-   }
+-   // \brief Return the package iterator if storing a package, or an empty one
+-   pkgCache::PkgIterator Pkg(pkgCache &cache) const
+-   {
+-      return isVersion() ? pkgCache::PkgIterator() : pkgCache::PkgIterator(cache, cache.PkgP + Pkg());
+-   }
+-   // \brief Return the version iterator if storing a package, or an empty end.
+-   pkgCache::VerIterator Ver(pkgCache &cache) const
+-   {
+-      return isVersion() ? pkgCache::VerIterator(cache, cache.VerP + Ver()) : pkgCache::VerIterator();
+-   }
+-   // \brief Return a package, cast from version if needed
+-   pkgCache::PkgIterator CastPkg(pkgCache &cache) const
+-   {
+-      return isVersion() ? Ver(cache).ParentPkg() : Pkg(cache);
+-   }
+-   // \brief Check if there is no reason.
+-   constexpr bool empty() const { return value == 0; }
+-   constexpr bool operator!=(Var const other) const { return value != other.value; }
+-   constexpr bool operator==(Var const other) const { return value == other.value; }
+-
+-   std::string toString(pkgCache &cache) const
+-   {
+-      if (auto P = Pkg(cache); not P.end())
+-	 return P.FullName();
+-      if (auto V = Ver(cache); not V.end())
+-	 return V.ParentPkg().FullName() + "=" + V.VerStr();
+-      return "(root)";
+-   }
+-};
+-
+ /**
+  * \brief A single clause
+  *
meta/recipes-devtools/apt/apt_3.0.3.bb +4 -0
index 03a6869393b..666e059cccc 100644
@@ -11,6 +11,8 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/${BPN}_${PV}.tar.xz \
            file://0001-CMakeLists.txt-avoid-changing-install-paths-based-on.patch \
            file://0001-cmake-Do-not-build-po-files.patch \
            file://0001-fix-compilation-with-musl.patch \
+           file://0001-apt-avoid-std-basic_string_view-unsigned-char-in-Hex.patch \
+           file://0001-apt-define-Solver-Var-before-std-queue-members-to-sa.patch \
            "
 
 SRC_URI:append:class-native = " \
@@ -34,6 +36,8 @@ UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/apt/"
 # to express 'divisible by 4 plus 2' in regex (that I know of), let's hardcode a few.
 UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>((2\.2)|(2\.6)|(3\.0)|(3\.4)|(3\.8)|(4\.2))(\.\d+)+)\.tar"
 
+CXXFLAGS += "-Wno-unknown-attributes -Wno-vla-cxx-extension -Wno-misleading-indentation -Wno-unused-private-field"
+
 inherit cmake perlnative bash-completion useradd
 
 # User is added to allow apt to drop privs, will runtime warn without