proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-08-02 18:38:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Construct the --package-metadata option just from ELF_PACKAGE_METADATA.

Browse Source
This commit is contained in:
Matthias Klose 2024-07-11 09:28:10 +02:00
parent 50000c16af
commit 7a3ca233a9
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
llvm-toolchain-18 (1:18.1.8-3) UNRELEASED; urgency=medium
* Construct the --package-metadata option just from ELF_PACKAGE_METADATA.
-- Matthias Klose <doko@debian.org> Thu, 11 Jul 2024 09:26:34 +0200
llvm-toolchain-18 (1:18.1.8-2) unstable; urgency=medium
[ Matthias Klose ]

20
debian/patches/link-with-package-metadata.diff vendored
View File

@ -1,33 +1,21 @@
--- a/clang/lib/Driver/ToolChains/Linux.cpp
+++ b/clang/lib/Driver/ToolChains/Linux.cpp
@@ -287,6 +287,33 @@ Linux::Linux(const Driver &D, const llvm
@@ -283,6 +283,21 @@ Linux::Linux(const Driver &D, const llvm
ExtraOpts.push_back("--build-id");
#endif
+ if (Distro.IsDebian() && Distro >= Distro::DebianTrixie
+ || Distro.IsUbuntu() && Distro >= Distro::UbuntuNoble)
+ {
+ const char *deb_build_os_release_id = getenv ("DEB_BUILD_OS_RELEASE_ID");
+ const char *deb_source = getenv ("DEB_SOURCE");
+ const char *deb_version = getenv ("DEB_VERSION");
+ const char *deb_host_arch = getenv ("DEB_HOST_ARCH");
+ const char pkg_metadata = getenv ("ELF_PACKAGE_METADATA");
+ const char *no_pkg_metadata = getenv ("NO_PKG_METADATA");
+
+ if (no_pkg_metadata) {
+ // don't issue --package-metadata option
+ } else if (!deb_build_os_release_id && !deb_source && !deb_version && !deb_host_arch) {
+ } else if (!pkg_metadata) {
+ // no environment set for package metadata
+ } else if (!(deb_build_os_release_id && deb_source && deb_version && deb_host_arch)) {
+ // incomple environment
+ // FIXME: emit error
+ } else {
+ ExtraOpts.push_back(std::string("--package-metadata={")
+ + "\"type\":\"deb\","
+ + "\"os\":\"" + deb_build_os_release_id + "\","
+ + "\"name\":\"" + deb_source + "\","
+ + "\"version\":\"" + deb_version + "\","
+ + "\"architecture\":\"" + deb_host_arch + "\""
+ + "}");
+ ExtraOpts.push_back(std::string("--package-metadata=") + pkg_metadata);
+ }
+ }
+