From f91487fa13dd5d5cd5ff95982e7c00cebb744f02 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Sat, 2 Nov 2024 00:08:21 -0700 Subject: [PATCH] ld64: fix build with llvm19 remove unused and incomplete function --- pkgs/by-name/ld/ld64/package.nix | 1 + .../remove-unused-and-incomplete-blob-clone.diff | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/by-name/ld/ld64/remove-unused-and-incomplete-blob-clone.diff diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix index d3dfe3b8b7e6..b050c2ac647b 100644 --- a/pkgs/by-name/ld/ld64/package.nix +++ b/pkgs/by-name/ld/ld64/package.nix @@ -128,6 +128,7 @@ stdenv.mkDerivation (finalAttrs: { ./0006-Add-libcd_is_blob_a_linker_signature-implementation.patch # Add OpenSSL implementation of CoreCrypto digest functions. Avoids use of private and non-free APIs. ./0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch + ./remove-unused-and-incomplete-blob-clone.diff ]; postPatch = '' diff --git a/pkgs/by-name/ld/ld64/remove-unused-and-incomplete-blob-clone.diff b/pkgs/by-name/ld/ld64/remove-unused-and-incomplete-blob-clone.diff new file mode 100644 index 000000000000..88dd4304f6f7 --- /dev/null +++ b/pkgs/by-name/ld/ld64/remove-unused-and-incomplete-blob-clone.diff @@ -0,0 +1,14 @@ +diff --git a/src/ld/code-sign-blobs/blob.h b/src/ld/code-sign-blobs/blob.h +index 19c63a9..1dfb380 100644 +--- a/src/ld/code-sign-blobs/blob.h ++++ b/src/ld/code-sign-blobs/blob.h +@@ -180,9 +180,6 @@ public: + return NULL; + } + +- BlobType *clone() const +- { assert(validateBlob()); return specific(this->BlobCore::clone()); } +- + static BlobType *readBlob(int fd) + { return specific(BlobCore::readBlob(fd, _magic, sizeof(BlobType), 0), true); } +