From 9ea3878d01abb0224522c5cf9c34584bdf9fd4ba Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 10 Nov 2022 15:21:18 +0100 Subject: [PATCH] use the upstream option to set the option --- debian/patches/19-clang_debian_version.patch | 21 -------------------- debian/patches/series | 1 - 2 files changed, 22 deletions(-) delete mode 100644 debian/patches/19-clang_debian_version.patch diff --git a/debian/patches/19-clang_debian_version.patch b/debian/patches/19-clang_debian_version.patch deleted file mode 100644 index 89ac6bdc..00000000 --- a/debian/patches/19-clang_debian_version.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/lib/Basic/Version.cpp -=================================================================== ---- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/clang/lib/Basic/Version.cpp -+++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/clang/lib/Basic/Version.cpp -@@ -14,6 +14,7 @@ - #include "clang/Basic/LLVM.h" - #include "clang/Config/config.h" - #include "llvm/Support/raw_ostream.h" -+#include "clang/Debian/debian_path.h" - #include - #include - -@@ -95,7 +96,7 @@ std::string getClangToolFullVersion(Stri - #ifdef CLANG_VENDOR - OS << CLANG_VENDOR; - #endif -- OS << ToolName << " version " CLANG_VERSION_STRING; -+ OS << ToolName << " version " CLANG_VERSION_STRING "-" DEB_PATCHSETVERSION; - - std::string repo = getClangFullRepositoryVersion(); - if (!repo.empty()) { diff --git a/debian/patches/series b/debian/patches/series index 1d83b5f0..58e159af 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ # Debian versions -19-clang_debian_version.patch 0003-Debian-version-info-and-bugreport.patch clang-format-version.diff clang-analyzer-force-version.diff -- 2.39.5