gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

llvmPackages_{12,13,14,15,16,17,18,19,20,git}.compiler-rt: move patches out of common

Browse Source
This commit is contained in:
Tristan Ross
2025-03-07 14:17:38 +01:00
committed by Alyssa Ross
parent 946113bbf7
commit c330ebeb4f
2 changed files with 78 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/llvm/common/compiler-rt/default.nix
+78 -2
View File
@@ -3,7 +3,6 @@
, llvm_meta
, release_version
, version
, patches ? []
, src ? null
, monorepoSrc ? null
, runCommand
@@ -29,6 +28,8 @@
# platforms still expect this, however, so we symlink one into place.
, forceLinkCompilerRt ? stdenv.hostPlatform.isOpenBSD
, devExtraCmakeFlags ? []
, getVersionFile
, fetchpatch
}:
let
@@ -57,11 +58,86 @@ let
in
stdenv.mkDerivation {
inherit pname version patches;
inherit pname version;
src = src';
sourceRoot = "${src'.name}/${baseName}";
patches =
lib.optional (lib.versionOlder release_version "15") (
getVersionFile "compiler-rt/codesign.patch"
) # Revert compiler-rt commit that makes codesign mandatory
++ [
(getVersionFile "compiler-rt/X86-support-extension.patch") # Add support for i486 i586 i686 by reusing i386 config
]
++ lib.optional (lib.versions.major release_version == "12") (fetchpatch {
# fixes the parallel build on aarch64 darwin
name = "fix-symlink-race-aarch64-darwin.patch";
url = "https://github.com/llvm/llvm-project/commit/b31080c596246bc26d2493cfd5e07f053cf9541c.patch";
relative = "compiler-rt";
hash = "sha256-Cv2NC8402yU7QaTR6TzdH+qyWRy+tTote7KKWtKRWFQ=";
})
++ lib.optional (
lib.versions.major release_version == "12"
|| (
lib.versionAtLeast release_version "14" && lib.versionOlder release_version "18"
)
) (getVersionFile "compiler-rt/gnu-install-dirs.patch")
++
lib.optional
(lib.versionAtLeast release_version "13" && lib.versionOlder release_version "18")
(fetchpatch {
name = "cfi_startproc-after-label.patch";
url = "https://github.com/llvm/llvm-project/commit/7939ce39dac0078fef7183d6198598b99c652c88.patch";
stripLen = 1;
hash = "sha256-tGqXsYvUllFrPa/r/dsKVlwx5IrcJGccuR1WAtUg7/o=";
})
++ [
# ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the
# extra `/`.
(getVersionFile "compiler-rt/normalize-var.patch")
]
++
lib.optional
(lib.versionAtLeast release_version "13" && lib.versionOlder release_version "18")
# Prevent a compilation error on darwin
(getVersionFile "compiler-rt/darwin-targetconditionals.patch")
# TODO: make unconditional and remove in <15 section below. Causes rebuilds.
++ lib.optionals (lib.versionAtLeast release_version "15") [
# See: https://github.com/NixOS/nixpkgs/pull/186575
./darwin-plistbuddy-workaround.patch
]
++
lib.optional (lib.versions.major release_version == "15")
# See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893
./armv7l-15.patch
++ lib.optionals (lib.versionOlder release_version "15") [
./darwin-plistbuddy-workaround.patch
(getVersionFile "compiler-rt/armv7l.patch")
# Fix build on armv6l
./armv6-mcr-dmb.patch
./armv6-sync-ops-no-thumb.patch
]
++
lib.optionals
(lib.versionAtLeast release_version "13" && lib.versionOlder release_version "18")
[
# Fix build on armv6l
./armv6-scudo-no-yield.patch
]
++ [
# Fix build on armv6l
./armv6-no-ldrexd-strexd.patch
]
++ lib.optionals (lib.versionAtLeast release_version "13") [
(getVersionFile "compiler-rt/armv6-scudo-libatomic.patch")
]
++ lib.optional (lib.versions.major release_version == "19") (fetchpatch {
url = "https://github.com/llvm/llvm-project/pull/99837/commits/14ae0a660a38e1feb151928a14f35ff0f4487351.patch";
hash = "sha256-JykABCaNNhYhZQxCvKiBn54DZ5ZguksgCHnpdwWF2no=";
relative = "compiler-rt";
});
nativeBuildInputs = [ cmake ]
++ (lib.optional (lib.versionAtLeast release_version "15") ninja)
++ [ python3 libllvm.dev ]
pkgs/development/compilers/llvm/common/default.nix
-77
View File
@@ -908,81 +908,6 @@ let
# Previously monorepoSrc was erroneously not being passed through.
// lib.optionalAttrs (lib.versionOlder metadata.release_version "14") { monorepoSrc = null; } # Preserve a bug during #307211, TODO: remove; causes llvm 13 rebuild.
);
compiler-rtPatches =
lib.optional (lib.versionOlder metadata.release_version "15") (
metadata.getVersionFile "compiler-rt/codesign.patch"
) # Revert compiler-rt commit that makes codesign mandatory
++ [
(metadata.getVersionFile "compiler-rt/X86-support-extension.patch") # Add support for i486 i586 i686 by reusing i386 config
]
++ lib.optional (lib.versions.major metadata.release_version == "12") (fetchpatch {
# fixes the parallel build on aarch64 darwin
name = "fix-symlink-race-aarch64-darwin.patch";
url = "https://github.com/llvm/llvm-project/commit/b31080c596246bc26d2493cfd5e07f053cf9541c.patch";
relative = "compiler-rt";
hash = "sha256-Cv2NC8402yU7QaTR6TzdH+qyWRy+tTote7KKWtKRWFQ=";
})
++ lib.optional (
lib.versions.major metadata.release_version == "12"
|| (
lib.versionAtLeast metadata.release_version "14" && lib.versionOlder metadata.release_version "18"
)
) (metadata.getVersionFile "compiler-rt/gnu-install-dirs.patch")
++
lib.optional
(lib.versionAtLeast metadata.release_version "13" && lib.versionOlder metadata.release_version "18")
(fetchpatch {
name = "cfi_startproc-after-label.patch";
url = "https://github.com/llvm/llvm-project/commit/7939ce39dac0078fef7183d6198598b99c652c88.patch";
stripLen = 1;
hash = "sha256-tGqXsYvUllFrPa/r/dsKVlwx5IrcJGccuR1WAtUg7/o=";
})
++ [
# ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the
# extra `/`.
(metadata.getVersionFile "compiler-rt/normalize-var.patch")
]
++
lib.optional
(lib.versionAtLeast metadata.release_version "13" && lib.versionOlder metadata.release_version "18")
# Prevent a compilation error on darwin
(metadata.getVersionFile "compiler-rt/darwin-targetconditionals.patch")
# TODO: make unconditional and remove in <15 section below. Causes rebuilds.
++ lib.optionals (lib.versionAtLeast metadata.release_version "15") [
# See: https://github.com/NixOS/nixpkgs/pull/186575
./compiler-rt/darwin-plistbuddy-workaround.patch
]
++
lib.optional (lib.versions.major metadata.release_version == "15")
# See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893
./compiler-rt/armv7l-15.patch
++ lib.optionals (lib.versionOlder metadata.release_version "15") [
./compiler-rt/darwin-plistbuddy-workaround.patch
(metadata.getVersionFile "compiler-rt/armv7l.patch")
# Fix build on armv6l
./compiler-rt/armv6-mcr-dmb.patch
./compiler-rt/armv6-sync-ops-no-thumb.patch
]
++
lib.optionals
(lib.versionAtLeast metadata.release_version "13" && lib.versionOlder metadata.release_version "18")
[
# Fix build on armv6l
./compiler-rt/armv6-scudo-no-yield.patch
]
++ [
# Fix build on armv6l
./compiler-rt/armv6-no-ldrexd-strexd.patch
]
++ lib.optionals (lib.versionAtLeast metadata.release_version "13") [
(metadata.getVersionFile "compiler-rt/armv6-scudo-libatomic.patch")
]
++ lib.optional (lib.versions.major metadata.release_version == "19") (fetchpatch {
url = "https://github.com/llvm/llvm-project/pull/99837/commits/14ae0a660a38e1feb151928a14f35ff0f4487351.patch";
hash = "sha256-JykABCaNNhYhZQxCvKiBn54DZ5ZguksgCHnpdwWF2no=";
relative = "compiler-rt";
});
in
(
{
@@ -999,7 +924,6 @@ let
args.stdenv;
in
{
patches = compiler-rtPatches;
inherit stdenv;
}
// lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
@@ -1010,7 +934,6 @@ let
);
compiler-rt-no-libc = callPackage ./compiler-rt {
patches = compiler-rtPatches;
doFakeLibgcc = stdenv.hostPlatform.useLLVM or false;
stdenv =
# Darwin needs to use a bootstrap stdenv to avoid an infinite recursion when cross-compiling.