Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

lz4: Fix pkgsStatic build #51965

Merged
merged 1 commit into from Dec 13, 2018
Merged

lz4: Fix pkgsStatic build #51965

merged 1 commit into from Dec 13, 2018

Conversation

vaibhavsagar
Copy link
Member

@vaibhavsagar vaibhavsagar commented Dec 13, 2018 •
edited

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Mic92 Mic92 changed the title lz4: fix pkgsStatic build [WIP] lz4: fix pkgsStatic build Dec 13, 2018
@Mic92
Copy link
Member

Mic92 commented Dec 13, 2018

Marked as WIP because of the todos.

@vaibhavsagar
Copy link
Member Author

@Mic92 the TODOs are to prevent a mass rebuild, this is good to go as is.

Mic92
Mic92 reviewed Dec 13, 2018
View reviewed changes
pkgs/tools/compression/lz4/default.nix
makeFlags = [ "PREFIX=$(out)" "INCLUDEDIR=$(dev)/include" ]
# TODO always define both
++ stdenv.lib.optional (!enableStatic) "BUILD_STATIC=no"
++ stdenv.lib.optional (!enableShared) "BUILD_SHARED=no"
Copy link
Member

Choose a reason for hiding this comment

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

makeFlags = [ 
  "PREFIX=$(out)" 
  "INCLUDEDIR=$(dev)/include"
  "BUILD_STATIC=${if enableStatic then "yes" else "now"}"
  "BUILD_SHARED=${if enableShared then "yes" else "now"}"
]

@vaibhavsagar vaibhavsagar changed the title [WIP] lz4: fix pkgsStatic build lz4: fix pkgsStatic build Dec 13, 2018
@Mic92
Copy link
Member

Mic92 commented Dec 13, 2018 •
edited

However it does not prevent a rebuild because makeFlags changed.

@vaibhavsagar vaibhavsagar changed the title lz4: fix pkgsStatic build [WIP] lz4: fix pkgsStatic build Dec 13, 2018
@vaibhavsagar
Copy link
Member Author

Advised to mark this WIP by @Ericson2314, changing back.

@vaibhavsagar
Copy link
Member Author

@Mic92 better now?

@Mic92
Copy link
Member

Mic92 commented Dec 13, 2018 •
edited

It is still a mass-rebuild because makeFlags gets extended by your flag. However you can also just address the TODOs and move the commit to staging.

@Ericson2314
Copy link
Member

@Mic92 my intention is to rebase this on top of the second-to-top branch commit of #51957 and merge into both stable and master for immediate usage, so I definitely don't want this to be a mass rebuild. We'll get it not to be shortly.

@vaibhavsagar vaibhavsagar mentioned this pull request Dec 13, 2018
Merged
10 tasks
@Ericson2314 Ericson2314 changed the title [WIP] lz4: fix pkgsStatic build lz4: fix pkgsStatic build Dec 13, 2018
@Ericson2314 Ericson2314 changed the title lz4: fix pkgsStatic build lz4: Fix pkgsStatic build Dec 13, 2018
@Ericson2314
Copy link
Member

OK both this and it's 18.09 equivalent, #51969, are just waiting on @ofborg. After they're merged, we can do the staging cleanup.

@Ericson2314 Ericson2314 merged commit e0a4d10 into NixOS:master Dec 13, 2018
@vaibhavsagar
Copy link
Member Author

Thanks!

@vaibhavsagar vaibhavsagar deleted the fix-static-lz4 branch December 14, 2018 14:59
vcunat added a commit that referenced this pull request Feb 10, 2020
@vcunat
lz4: do the refactoring forgotten after PR #51965
35b13b5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@vaibhavsagar @Mic92 @Ericson2314 @GrahamcOfBorg