Skip to content

llvmPackages.libcxxabi: dedupe wasm.patch#253573

Merged
Artturin merged 4 commits intoNixOS:stagingfrom
Artturin:llvmdedup2
Sep 6, 2023
Merged

llvmPackages.libcxxabi: dedupe wasm.patch#253573
Artturin merged 4 commits intoNixOS:stagingfrom
Artturin:llvmdedup2

Conversation

@Artturin
Copy link
Member

@Artturin Artturin commented Sep 6, 2023

found with fdupes

pkgs/development/compilers/llvm/8/libcxxabi/wasm.patch
pkgs/development/compilers/llvm/13/libcxxabi/wasm.patch
pkgs/development/compilers/llvm/14/libcxxabi/wasm.patch
pkgs/development/compilers/llvm/10/libcxxabi/wasm.patch
pkgs/development/compilers/llvm/15/libcxxabi/wasm.patch
pkgs/development/compilers/llvm/12/libcxxabi/wasm.patch
pkgs/development/compilers/llvm/9/libcxxabi/wasm.patch
pkgs/development/compilers/llvm/16/libcxxabi/wasm.patch
pkgs/development/compilers/llvm/git/libcxxabi/wasm.patch
pkgs/development/compilers/llvm/11/libcxxabi/wasm.patch

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Sep 6, 2023
@Artturin Artturin force-pushed the llvmdedup2 branch 2 times, most recently from 1d2f434 to ef97c60 Compare September 6, 2023 14:26
@ofborg ofborg bot added the 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. label Sep 6, 2023
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Sep 6, 2023
@Artturin
llvmPackages.libcxxabi: dedupe wasm.patch
ea946c7 
found with fdupes

```
pkgs/development/compilers/llvm/8/libcxxabi/wasm.patch
pkgs/development/compilers/llvm/13/libcxxabi/wasm.patch
pkgs/development/compilers/llvm/14/libcxxabi/wasm.patch
pkgs/development/compilers/llvm/10/libcxxabi/wasm.patch
pkgs/development/compilers/llvm/15/libcxxabi/wasm.patch
pkgs/development/compilers/llvm/12/libcxxabi/wasm.patch
pkgs/development/compilers/llvm/9/libcxxabi/wasm.patch
pkgs/development/compilers/llvm/16/libcxxabi/wasm.patch
pkgs/development/compilers/llvm/git/libcxxabi/wasm.patch
pkgs/development/compilers/llvm/11/libcxxabi/wasm.patch
```
@Artturin
llvmPackages.libcxxabi: dedupe no-threads.patch
ac62f86 
found with fdupes

```
pkgs/development/compilers/llvm/8/libcxxabi/no-threads.patch
pkgs/development/compilers/llvm/10/libcxxabi/no-threads.patch
pkgs/development/compilers/llvm/9/libcxxabi/no-threads.patch
pkgs/development/compilers/llvm/11/libcxxabi/no-threads.patch
```
@Artturin
llvmPackages.compiler-rt: dedupe codesign.patch 7-12
079fa2f 
found with fdupes

```
pkgs/development/compilers/llvm/8/compiler-rt/codesign.patch
pkgs/development/compilers/llvm/10/compiler-rt/codesign.patch
pkgs/development/compilers/llvm/12/compiler-rt/codesign.patch
pkgs/development/compilers/llvm/9/compiler-rt/codesign.patch
pkgs/development/compilers/llvm/7/compiler-rt/codesign.patch
pkgs/development/compilers/llvm/11/compiler-rt/codesign.patch
```
@Artturin
llvmPackages.clang: dedupe purity.patch 5-8
3b16ddf 
found with fdupes

```
pkgs/development/compilers/llvm/8/clang/purity.patch
pkgs/development/compilers/llvm/5/clang/purity.patch
pkgs/development/compilers/llvm/6/clang/purity.patch
pkgs/development/compilers/llvm/7/clang/purity.patch
```
@Artturin Artturin changed the base branch from master to staging September 6, 2023 16:16
Artturin
Artturin commented Sep 6, 2023
View reviewed changes
pkgs/development/compilers/llvm/10/compiler-rt/default.nix

patches = [
./codesign.patch # Revert compiler-rt commit that makes codesign mandatory
../../common/compiler-rt/7-12-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
Copy link
Member Author

@Artturin Artturin Sep 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The rebuilds are due to changing of the patch name.

@Artturin Artturin marked this pull request as ready for review September 6, 2023 16:26
@Artturin Artturin mentioned this pull request Sep 6, 2023
Closed
@Artturin Artturin merged commit 0d16a6b into NixOS:staging Sep 6, 2023
@Artturin Artturin deleted the llvmdedup2 branch September 6, 2023 18:15
@Artturin
Copy link
Member Author

Artturin commented Sep 6, 2023

Result of nixpkgs-review pr 253573 run on x86_64-linux 1

106 packages built:
  • llvmPackages.clang (llvmPackages.libstdcxxClang ,llvmPackages_11.clang ,llvmPackages_11.libstdcxxClang)
  • llvmPackages.clangNoLibc (llvmPackages_11.clangNoLibc)
  • llvmPackages.clangNoLibcxx (llvmPackages_11.clangNoLibcxx)
  • llvmPackages.clangUseLLVM (llvmPackages_11.clangUseLLVM)
  • llvmPackages.compiler-rt (llvmPackages.compiler-rt-libc ,llvmPackages.compiler-rt-no-libc ,llvmPackages_11.compiler-rt ,llvmPackages_11.compiler-rt-libc ,llvmPackages_11.compiler-rt-no-libc)
  • llvmPackages.compiler-rt.dev (llvmPackages.compiler-rt-libc.dev ,llvmPackages_11.compiler-rt-libc.dev ,llvmPackages_11.compiler-rt-no-libc.dev ,llvmPackages_11.compiler-rt.dev)
  • llvmPackages.libcxxClang (llvmPackages_11.libcxxClang)
  • llvmPackages.libcxxStdenv (llvmPackages_11.libcxxStdenv)
  • llvmPackages.stdenv (llvmPackages_11.stdenv)
  • llvmPackages_10.clang (llvmPackages_10.libstdcxxClang)
  • llvmPackages_10.clangNoLibc
  • llvmPackages_10.clangNoLibcxx
  • llvmPackages_10.clangUseLLVM
  • llvmPackages_10.compiler-rt (llvmPackages_10.compiler-rt-libc ,llvmPackages_10.compiler-rt-no-libc)
  • llvmPackages_10.compiler-rt.dev (llvmPackages_10.compiler-rt-libc.dev)
  • llvmPackages_10.libcxxClang
  • llvmPackages_10.libcxxStdenv
  • llvmPackages_10.stdenv
  • llvmPackages_12.clang (llvmPackages_12.libstdcxxClang)
  • llvmPackages_12.clangNoLibc
  • llvmPackages_12.clangNoLibcxx
  • llvmPackages_12.clangUseLLVM
  • llvmPackages_12.compiler-rt (llvmPackages_12.compiler-rt-libc ,llvmPackages_12.compiler-rt-no-libc)
  • llvmPackages_12.compiler-rt.dev (llvmPackages_12.compiler-rt-libc.dev)
  • llvmPackages_12.libcxxClang
  • llvmPackages_12.libcxxStdenv
  • llvmPackages_12.stdenv
  • llvmPackages_5.clang (llvmPackages_5.libstdcxxClang)
  • llvmPackages_5.clang-manpages
  • llvmPackages_5.libclang (llvmPackages_5.clang-unwrapped)
  • llvmPackages_5.libclang.dev (llvmPackages_5.clang-unwrapped.dev)
  • llvmPackages_5.libclang.lib (llvmPackages_5.clang-unwrapped.lib)
  • llvmPackages_5.libclang.python (llvmPackages_5.clang-unwrapped.python)
  • llvmPackages_5.libcxxClang
  • llvmPackages_5.libcxxStdenv
  • llvmPackages_5.lldb
  • llvmPackages_5.lldb.dev
  • llvmPackages_5.lldb.lib
  • llvmPackages_5.stdenv
  • llvmPackages_6.clang (llvmPackages_6.libstdcxxClang)
  • llvmPackages_6.clang-manpages
  • llvmPackages_6.libclang (llvmPackages_6.clang-unwrapped)
  • llvmPackages_6.libclang.dev (llvmPackages_6.clang-unwrapped.dev)
  • llvmPackages_6.libclang.lib (llvmPackages_6.clang-unwrapped.lib)
  • llvmPackages_6.libclang.python (llvmPackages_6.clang-unwrapped.python)
  • llvmPackages_6.libcxxClang
  • llvmPackages_6.libcxxStdenv
  • llvmPackages_6.lldb
  • llvmPackages_6.lldb.dev
  • llvmPackages_6.lldb.lib
  • llvmPackages_6.stdenv
  • llvmPackages_7.clang (llvmPackages_7.libstdcxxClang)
  • llvmPackages_7.clang-manpages
  • llvmPackages_7.clang-polly-unwrapped
  • llvmPackages_7.clang-polly-unwrapped.dev
  • llvmPackages_7.clang-polly-unwrapped.lib
  • llvmPackages_7.clang-polly-unwrapped.python
  • llvmPackages_7.libclang (llvmPackages_7.clang-unwrapped)
  • llvmPackages_7.libclang.dev (llvmPackages_7.clang-unwrapped.dev)
  • llvmPackages_7.libclang.lib (llvmPackages_7.clang-unwrapped.lib)
  • llvmPackages_7.libclang.python (llvmPackages_7.clang-unwrapped.python)
  • llvmPackages_7.clangNoCompilerRt
  • llvmPackages_7.clangNoCompilerRtWithLibc
  • llvmPackages_7.clangNoLibc
  • llvmPackages_7.clangNoLibcxx
  • llvmPackages_7.clangUseLLVM
  • llvmPackages_7.compiler-rt (llvmPackages_7.compiler-rt-libc ,llvmPackages_7.compiler-rt-no-libc)
  • llvmPackages_7.compiler-rt.dev (llvmPackages_7.compiler-rt-libc.dev)
  • llvmPackages_7.libcxxClang
  • llvmPackages_7.libcxxStdenv
  • llvmPackages_7.lldb
  • llvmPackages_7.lldb.dev
  • llvmPackages_7.lldb.lib
  • llvmPackages_7.stdenv
  • llvmPackages_8.clang (llvmPackages_8.libstdcxxClang)
  • llvmPackages_8.clang-manpages
  • llvmPackages_8.clang-polly-unwrapped
  • llvmPackages_8.clang-polly-unwrapped.dev
  • llvmPackages_8.clang-polly-unwrapped.lib
  • llvmPackages_8.clang-polly-unwrapped.python
  • llvmPackages_8.libclang (llvmPackages_8.clang-unwrapped)
  • llvmPackages_8.libclang.dev (llvmPackages_8.clang-unwrapped.dev)
  • llvmPackages_8.libclang.lib (llvmPackages_8.clang-unwrapped.lib)
  • llvmPackages_8.libclang.python (llvmPackages_8.clang-unwrapped.python)
  • llvmPackages_8.clangNoCompilerRt
  • llvmPackages_8.clangNoCompilerRtWithLibc
  • llvmPackages_8.clangNoLibc
  • llvmPackages_8.clangNoLibcxx
  • llvmPackages_8.clangUseLLVM
  • llvmPackages_8.compiler-rt (llvmPackages_8.compiler-rt-libc ,llvmPackages_8.compiler-rt-no-libc)
  • llvmPackages_8.compiler-rt.dev (llvmPackages_8.compiler-rt-libc.dev)
  • llvmPackages_8.libcxxClang
  • llvmPackages_8.libcxxStdenv
  • llvmPackages_8.lldb
  • llvmPackages_8.lldb.dev
  • llvmPackages_8.lldb.lib
  • llvmPackages_8.stdenv
  • llvmPackages_9.clang (llvmPackages_9.libstdcxxClang)
  • llvmPackages_9.clangNoLibc
  • llvmPackages_9.clangNoLibcxx
  • llvmPackages_9.clangUseLLVM
  • llvmPackages_9.compiler-rt (llvmPackages_9.compiler-rt-libc ,llvmPackages_9.compiler-rt-no-libc)
  • llvmPackages_9.compiler-rt.dev (llvmPackages_9.compiler-rt-libc.dev)
  • llvmPackages_9.libcxxClang
  • llvmPackages_9.libcxxStdenv
  • llvmPackages_9.stdenv

@rrbutani rrbutani added the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label May 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sternenseemann sternenseemann Awaiting requested review from sternenseemann

@lovek323 lovek323 Awaiting requested review from lovek323

@RaitoBezarius RaitoBezarius Awaiting requested review from RaitoBezarius

@alyssais alyssais Awaiting requested review from alyssais

@primeos primeos Awaiting requested review from primeos

@rrbutani rrbutani Awaiting requested review from rrbutani

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@dtzWill dtzWill Awaiting requested review from dtzWill

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

Assignees

No one assigned

Labels

6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Artturin @rrbutani