llvmPackages_7: init on release-18.09 #51771
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Copy of 6 + updated hashes (cherry picked from commit bb110d8)
(cherry picked from commit b7692f5)
(cherry picked from commit 3869989)
Quite possibly this is not right. (cherry picked from commit 621fd23)
(cherry picked from commit fca31e1)
Pretty sure they did last time too :). (cherry picked from commit 0920652)
(cherry picked from commit 167e799)
(cherry picked from commit e3030a2)
See llvm 2a6cf85828509e89e18739e5f4b9a958820d66d4 (cherry picked from commit b3645d7)
(cherry picked from commit 9fe245d)
(cherry picked from commit 5b2de51)
Merge branch 'release-18.09-llvm-7' into release-18.09 chromium builds best with llvm 7 and instead of taking the hit of hunting for gcc patches until release-18.09 is phased out, we just backport it see NixOS#51602 cc @dtzWill could you have a look at any commits, i might have missed? this merged branch was built as follows: ``` ± git merge-base release-18.09 master 2a1c0dd ± git checkout -b release-18.09-llvm-7 2a1c0dd Switched to a new branch 'release-18.09-llvm-7' ± git cherry-pick -x $(git log master --format=oneline -- pkgs/development/compilers/llvm/7 | cut -f1 -d' ' | tac ) [release-18.09-llvm-7 0120cd8826f] llvm7: init at 7.0.0rc3 Author: Will Dietz <w@wdtz.org> Date: Tue Sep 18 14:19:58 2018 -0500 15 files changed, 1260 insertions(+) create mode 100644 pkgs/development/compilers/llvm/7/clang/default.nix create mode 100644 pkgs/development/compilers/llvm/7/clang/purity.patch create mode 100644 pkgs/development/compilers/llvm/7/compiler-rt-codesign.patch create mode 100644 pkgs/development/compilers/llvm/7/compiler-rt.nix create mode 100644 pkgs/development/compilers/llvm/7/default.nix create mode 100644 pkgs/development/compilers/llvm/7/libc++/default.nix create mode 100644 pkgs/development/compilers/llvm/7/libc++/setup-hook.sh create mode 100644 pkgs/development/compilers/llvm/7/libc++abi.nix create mode 100644 pkgs/development/compilers/llvm/7/lld.nix create mode 100644 pkgs/development/compilers/llvm/7/lldb.nix create mode 100644 pkgs/development/compilers/llvm/7/llvm-outputs.patch create mode 100644 pkgs/development/compilers/llvm/7/llvm.nix create mode 100644 pkgs/development/compilers/llvm/7/openmp.nix create mode 100644 pkgs/development/compilers/llvm/7/sanitizers-nongnu.patch [release-18.09-llvm-7 efc3c480d86] llvm7: patch test shebang (otherwise test fails) Author: Will Dietz <w@wdtz.org> Date: Tue Sep 18 14:35:21 2018 -0500 1 file changed, 2 insertions(+) [release-18.09-llvm-7 30d468d7f47] llvm-manpages: fix build by removing references to $lib output Author: Will Dietz <w@wdtz.org> Date: Tue Sep 18 14:45:39 2018 -0500 1 file changed, 3 insertions(+) [release-18.09-llvm-7 64b459e5ae3] comment Author: Will Dietz <w@wdtz.org> Date: Tue Sep 18 14:52:17 2018 -0500 1 file changed, 1 insertion(+), 1 deletion(-) [release-18.09-llvm-7 ad2705efb6e] compiler-rt: quickfix codesign patch by dropping hunks 'already applied' Author: Will Dietz <w@wdtz.org> Date: Tue Sep 18 15:00:39 2018 -0500 1 file changed, 33 insertions(+), 155 deletions(-) rewrite pkgs/development/compilers/llvm/7/compiler-rt-codesign.patch (78%) [release-18.09-llvm-7 f51bf899719] llvm7: use final release tarballs now that they're available Author: Will Dietz <w@wdtz.org> Date: Wed Sep 19 07:43:33 2018 -0500 1 file changed, 2 insertions(+), 2 deletions(-) [release-18.09-llvm-7 93244a2dc24] llvm7: update hashes, they did change after all. Author: Will Dietz <w@wdtz.org> Date: Wed Sep 19 08:00:23 2018 -0500 9 files changed, 9 insertions(+), 10 deletions(-) [release-18.09-llvm-7 1e9d9d2e4ff] llvm*: http -> https, prefer releases.llvm.org Author: Will Dietz <w@wdtz.org> Date: Wed Sep 19 08:02:21 2018 -0500 7 files changed, 7 insertions(+), 7 deletions(-) [release-18.09-llvm-7 f5e526ba11a] libc++7: prefer 'optional' as suggested by comment Author: Will Dietz <w@wdtz.org> Date: Wed Sep 19 08:36:40 2018 -0500 1 file changed, 1 insertion(+), 5 deletions(-) [release-18.09-llvm-7 f254fb70666] llvm7: only use 1 number in version suffix, upstream changed Author: Will Dietz <w@wdtz.org> Date: Thu Sep 20 19:42:44 2018 -0500 1 file changed, 1 insertion(+), 1 deletion(-) [release-18.09-llvm-7 fa6fed6230d] llvm7: optionally use libpfm (exegesis), default off w/darwin Author: Will Dietz <w@wdtz.org> Date: Thu Sep 20 19:53:59 2018 -0500 1 file changed, 4 insertions(+), 1 deletion(-) [release-18.09-llvm-7 21959244dc4] llvm7: update musl patch for sanitizers Author: Will Dietz <w@wdtz.org> Date: Mon Sep 24 10:43:07 2018 -0500 1 file changed, 75 insertions(+), 76 deletions(-) ```
bendlas
added
the
8.has: port to stable
vcunat
approved these changes
Dec 9, 2018
vcunat
pushed a commit
that referenced
this pull request
Dec 9, 2018
chromium builds best with llvm 7 and instead of taking the hit of hunting for gcc patches until release-18.09 is phased out, we just backport it see #51602 cc @dtzWill could you have a look at any commits, i might have missed? this merged branch was built as follows: ``` ± git merge-base release-18.09 master 2a1c0dd ± git checkout -b release-18.09-llvm-7 2a1c0dd Switched to a new branch 'release-18.09-llvm-7' ± git cherry-pick -x $(git log master --format=oneline -- pkgs/development/compilers/llvm/7 | cut -f1 -d' ' | tac ) [release-18.09-llvm-7 0120cd8826f] llvm7: init at 7.0.0rc3 Author: Will Dietz <w@wdtz.org> Date: Tue Sep 18 14:19:58 2018 -0500 15 files changed, 1260 insertions(+) create mode 100644 pkgs/development/compilers/llvm/7/clang/default.nix create mode 100644 pkgs/development/compilers/llvm/7/clang/purity.patch create mode 100644 pkgs/development/compilers/llvm/7/compiler-rt-codesign.patch create mode 100644 pkgs/development/compilers/llvm/7/compiler-rt.nix create mode 100644 pkgs/development/compilers/llvm/7/default.nix create mode 100644 pkgs/development/compilers/llvm/7/libc++/default.nix create mode 100644 pkgs/development/compilers/llvm/7/libc++/setup-hook.sh create mode 100644 pkgs/development/compilers/llvm/7/libc++abi.nix create mode 100644 pkgs/development/compilers/llvm/7/lld.nix create mode 100644 pkgs/development/compilers/llvm/7/lldb.nix create mode 100644 pkgs/development/compilers/llvm/7/llvm-outputs.patch create mode 100644 pkgs/development/compilers/llvm/7/llvm.nix create mode 100644 pkgs/development/compilers/llvm/7/openmp.nix create mode 100644 pkgs/development/compilers/llvm/7/sanitizers-nongnu.patch [release-18.09-llvm-7 efc3c480d86] llvm7: patch test shebang (otherwise test fails) Author: Will Dietz <w@wdtz.org> Date: Tue Sep 18 14:35:21 2018 -0500 1 file changed, 2 insertions(+) [release-18.09-llvm-7 30d468d7f47] llvm-manpages: fix build by removing references to $lib output Author: Will Dietz <w@wdtz.org> Date: Tue Sep 18 14:45:39 2018 -0500 1 file changed, 3 insertions(+) [release-18.09-llvm-7 64b459e5ae3] comment Author: Will Dietz <w@wdtz.org> Date: Tue Sep 18 14:52:17 2018 -0500 1 file changed, 1 insertion(+), 1 deletion(-) [release-18.09-llvm-7 ad2705efb6e] compiler-rt: quickfix codesign patch by dropping hunks 'already applied' Author: Will Dietz <w@wdtz.org> Date: Tue Sep 18 15:00:39 2018 -0500 1 file changed, 33 insertions(+), 155 deletions(-) rewrite pkgs/development/compilers/llvm/7/compiler-rt-codesign.patch (78%) [release-18.09-llvm-7 f51bf899719] llvm7: use final release tarballs now that they're available Author: Will Dietz <w@wdtz.org> Date: Wed Sep 19 07:43:33 2018 -0500 1 file changed, 2 insertions(+), 2 deletions(-) [release-18.09-llvm-7 93244a2dc24] llvm7: update hashes, they did change after all. Author: Will Dietz <w@wdtz.org> Date: Wed Sep 19 08:00:23 2018 -0500 9 files changed, 9 insertions(+), 10 deletions(-) [release-18.09-llvm-7 1e9d9d2e4ff] llvm*: http -> https, prefer releases.llvm.org Author: Will Dietz <w@wdtz.org> Date: Wed Sep 19 08:02:21 2018 -0500 7 files changed, 7 insertions(+), 7 deletions(-) [release-18.09-llvm-7 f5e526ba11a] libc++7: prefer 'optional' as suggested by comment Author: Will Dietz <w@wdtz.org> Date: Wed Sep 19 08:36:40 2018 -0500 1 file changed, 1 insertion(+), 5 deletions(-) [release-18.09-llvm-7 f254fb70666] llvm7: only use 1 number in version suffix, upstream changed Author: Will Dietz <w@wdtz.org> Date: Thu Sep 20 19:42:44 2018 -0500 1 file changed, 1 insertion(+), 1 deletion(-) [release-18.09-llvm-7 fa6fed6230d] llvm7: optionally use libpfm (exegesis), default off w/darwin Author: Will Dietz <w@wdtz.org> Date: Thu Sep 20 19:53:59 2018 -0500 1 file changed, 4 insertions(+), 1 deletion(-) [release-18.09-llvm-7 21959244dc4] llvm7: update musl patch for sanitizers Author: Will Dietz <w@wdtz.org> Date: Mon Sep 24 10:43:07 2018 -0500 1 file changed, 75 insertions(+), 76 deletions(-) ```
|
I rebased the merge commit to avoid larger merge depth: d56ec49. I don't see anything to wait for; we can improve later in the worst case. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
chromium builds best with llvm 7 and instead of taking the hit of
hunting for gcc patches until release-18.09 is phased out, we just
backport it
see #51602
cc @dtzWill could you have a look at any commits, i might have missed?
this merged branch was built as follows:
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)