bzip2: use autoconf patch and remove in-house patching#11127
bzip2: use autoconf patch and remove in-house patching#11127peti merged 1 commit intoNixOS:stagingfrom
Conversation
|
Oh in case you wonder why I removed linkStatic: it is nowhere used in the repository. You can check with: https://github.com/NixOS/nixpkgs/search?utf8=%E2%9C%93&q=linkstatic I did find some old traces to a linkStatic enabled bzip2 in the git history, and apparently at some point static builds of bzip2 were used for bootstrap purposes. But this got removed, so I thought it made sense to chuck it out with this patch as well. |
|
I've now finished a test against staging as well (i.e. the tree exactly as in this pull request), both the native and cross builds. Maybe it is useful to list the changes from native staging:
The mingw cross build produced is byte-for-byte identical to the one from patch #11126 (except for reference to the bzip2 lib path the nix store in the pkgconfig file, which obviously has to be different). Is there anything else I should be testing? For the sake of it, I also built nix; this worked. Darwin wasn't tested; unfortunately I don't have the hardware to do so. So it would be good if someone with the hardware would test the build before we merge this (at least if this patch is desirable). I checked the macports repository, but they also use an in-house custom patched version of the makefile: https://svn.macports.org/repository/macports/trunk/dports/archivers/bzip2/Portfile |
bzip2: use autoconf patch and remove in-house patching
|
I anticipate removing |
|
Many thanks for merging. Touching wood... |
Replaces #10820; alternative to #11126.
In addition to #11126, this patch uses the autoconf infrastructure not only for the cross build, but also for the native build, allowing most of the hacks to be removed and thereby resulting in a simpler nix expression. This will obviously cause a large mass rebuild.
This patch is obviously a lot more risky, as a lot of core tools depend on native bzip2.
cc @aszlig @peti