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.

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

gnumake3: remove #37658

Merged
merged 4 commits into from Nov 15, 2018
Merged

gnumake3: remove #37658

merged 4 commits into from Nov 15, 2018

Conversation

pbogdan
Copy link
Member

@pbogdan pbogdan commented Mar 22, 2018

Motivation for this change

It won't build any more after glibc 2.27 update - https://hydra.nixos.org/build/71662181 (the update is in staging only ATM). Rather than trying to patch make itself I tried building everything that depends on it with the default one and all of them succeeded (coq_8_3 needed a small patch to its configure script, I also got rid of redundant parts of the existing patch).
As it's more of a clean up that doesn't directly depend on anything in staging I'm opening this against master. Please let me know if it should go into staging instead.

/cc maintainers of affected packages @jwiegley @roconnor @vbgl @bjornfor

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

EDIT: build got fixed in 492ca7b, leaving this open in case we still want to get rid of it.

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: coq2html, coq_8_3, lensfun, ngrep

Partial log (click to expand)

make[2]: Leaving directory '/build/ocaml-3.12.1'
make[1]: *** [Makefile:253: opt-core] Error 2
make[1]: Leaving directory '/build/ocaml-3.12.1'
make: *** [Makefile:143: world.opt] Error 2
builder for '/nix/store/w1pc31rv8zvxm9yxcq3ds3a9j8bs24jg-ocaml-3.12.1.drv' failed with exit code 2
cannot build derivation '/nix/store/l7gpz92dhzw4pbqjdvqa7z0v3bagwphq-camlp5_transitional-7.05.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/2lndl41fzkdsdcjq15vhhixdbh26vwm2-ocaml-findlib-1.7.3.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/j6nkw4ahi6swrh1fhj32d4vgjfpkvsg1-lablgtk-2.14.0.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/8s72qk96yrmb2cll32p4y8nd9fm3clyb-coq-8.3pl4.drv': 4 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/8s72qk96yrmb2cll32p4y8nd9fm3clyb-coq-8.3pl4.drv', '/nix/store/hblbs8yb75vjlv41mbcff6yhv6kni67f-lensfun-0.3.2.drv' failed

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: coq2html, coq_8_3, lensfun, ngrep

Partial log (click to expand)

gzipping man pages under /nix/store/ghv2p4lx1xq9hdmbmdxycv9ckbl57bkd-coq-8.3pl4/share/man/
strip is /nix/store/fzcs0fn6bb04m82frhlb78nc03ny3w55-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/ghv2p4lx1xq9hdmbmdxycv9ckbl57bkd-coq-8.3pl4/lib  /nix/store/ghv2p4lx1xq9hdmbmdxycv9ckbl57bkd-coq-8.3pl4/bin
patching script interpreter paths in /nix/store/ghv2p4lx1xq9hdmbmdxycv9ckbl57bkd-coq-8.3pl4
checking for references to /build in /nix/store/ghv2p4lx1xq9hdmbmdxycv9ckbl57bkd-coq-8.3pl4...
wrong ELF type
/nix/store/mjwwg22x24sg02f44gly9xfclb8llk0v-coq2html-20170720
/nix/store/ghv2p4lx1xq9hdmbmdxycv9ckbl57bkd-coq-8.3pl4
/nix/store/l9m5p9gkai4205l0sgix2fyq68sf8sdi-lensfun-0.3.2
/nix/store/a0w6ik8f9lj6hj9zi66lzilzcqc8kgvx-ngrep-1.47

@pbogdan
Copy link
Member Author

pbogdan commented Apr 11, 2018

FYI the glibc update is now in master.

@pbogdan
Copy link
Member Author

pbogdan commented Apr 11, 2018

@GrahamcOfBorg eval

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: coq2html, coq_8_3, lensfun, ngrep

Partial log (click to expand)

make[3]: *** [../Makefile:74: unix.cmxs] Error 2
make[3]: Leaving directory '/build/ocaml-4.05.0/otherlibs/unix'
make[2]: *** [Makefile:1055: otherlibrariesopt] Error 2
make[2]: Leaving directory '/build/ocaml-4.05.0'
make[1]: *** [Makefile:465: opt.opt] Error 2
make[1]: Leaving directory '/build/ocaml-4.05.0'
make: *** [Makefile:531: world.opt] Error 2
builder for '/nix/store/ajqgdzi3mmwacpk8mzfja0ivpxhdxwsh-ocaml-4.05.0.drv' failed with exit code 2
cannot build derivation '/nix/store/1kpkx2crsb3d07yxi6hjjcr6glzd6q7j-coq2html-20170720.drv': 1 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/1kpkx2crsb3d07yxi6hjjcr6glzd6q7j-coq2html-20170720.drv', '/nix/store/7p3shgs6prwcld9qdpvzpyhhvqqj5c8c-lensfun-0.3.2.drv', '/nix/store/jp5pq7vkwkfya67vgmkainwlq2kd9rcb-coq-8.3pl4.drv' failed

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: coq2html, coq_8_3, lensfun, ngrep

Partial log (click to expand)

gzipping man pages under /nix/store/ncy9vcjciwllifbrrsmi8vcmsjr6g9v9-coq-8.3pl4/share/man/
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/ncy9vcjciwllifbrrsmi8vcmsjr6g9v9-coq-8.3pl4/lib  /nix/store/ncy9vcjciwllifbrrsmi8vcmsjr6g9v9-coq-8.3pl4/bin
patching script interpreter paths in /nix/store/ncy9vcjciwllifbrrsmi8vcmsjr6g9v9-coq-8.3pl4
checking for references to /tmp/nix-build-coq-8.3pl4.drv-0 in /nix/store/ncy9vcjciwllifbrrsmi8vcmsjr6g9v9-coq-8.3pl4...
wrong ELF type
/nix/store/qa3l92bn2c9brq4hwfy4pn997qiw6vxf-coq2html-20170720
/nix/store/ncy9vcjciwllifbrrsmi8vcmsjr6g9v9-coq-8.3pl4
/nix/store/15drq11f04bcyjk9vawqa4bwrxfpziaa-lensfun-0.3.2
/nix/store/8pav53ayjx2092xp3i6w8kimkv4241pa-ngrep-1.47

pbogdan referenced this pull request Apr 12, 2018
This has already been patched against gnumake4 (519f0b8)
but we still have packages depending on gnumake3, so let's also apply
the same patch to gnumake 3.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @shlevy, @vcunat
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: coq2html, coq_8_3, lensfun, ngrep

Partial log (click to expand)

/nix/store/qa3l92bn2c9brq4hwfy4pn997qiw6vxf-coq2html-20170720
/nix/store/ncy9vcjciwllifbrrsmi8vcmsjr6g9v9-coq-8.3pl4
/nix/store/15drq11f04bcyjk9vawqa4bwrxfpziaa-lensfun-0.3.2
/nix/store/8pav53ayjx2092xp3i6w8kimkv4241pa-ngrep-1.47

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: coq2html, coq_8_3, lensfun, ngrep

Partial log (click to expand)

make[3]: *** [../Makefile:74: unix.cmxs] Error 2
make[3]: Leaving directory '/build/ocaml-4.05.0/otherlibs/unix'
make[2]: *** [Makefile:1055: otherlibrariesopt] Error 2
make[2]: Leaving directory '/build/ocaml-4.05.0'
make[1]: *** [Makefile:465: opt.opt] Error 2
make[1]: Leaving directory '/build/ocaml-4.05.0'
make: *** [Makefile:531: world.opt] Error 2
builder for '/nix/store/ajqgdzi3mmwacpk8mzfja0ivpxhdxwsh-ocaml-4.05.0.drv' failed with exit code 2
cannot build derivation '/nix/store/ay69pyhagbms7npasfazxcvl5g8m32rp-coq2html-20170720.drv': 1 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/7p3shgs6prwcld9qdpvzpyhhvqqj5c8c-lensfun-0.3.2.drv', '/nix/store/ay69pyhagbms7npasfazxcvl5g8m32rp-coq2html-20170720.drv', '/nix/store/fl12ac610nbm9kspaqnd95qgvlv9y5qz-coq-8.3pl4.drv' failed

@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0cfk8jjhs9nbfjfdy98plrj9ayi59aph0nx6ppslgjhlcvacm2xf";
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib zlib libpng cmake gnumake3 ];
nativeBuildInputs = [ cmake pkgconfig ];
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you add ninja, it is usually faster than make.

Copy link
Contributor

Choose a reason for hiding this comment

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

I'd think that in the context of Nix, make vs. ninja wouldn't make much difference. Ninja is certainly faster at determining that nothing needs to be done, but when you are building the project for the first time, and Ninja hasn't built up its databases yet, then I'd be surprised if the build time were changed significantly.

Copy link
Contributor

Choose a reason for hiding this comment

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

I measured it and both ninja and make back-ends seem to average slightly above five seconds on my machine. For larger codebases, though, ninja is significantly faster even when building from scratch according to my experiments. http://voices.canonical.com/jussi.pakkanen/2012/02/28/speed-bumps-hide-in-places-where-you-least-expect-them/ agrees with my observations.

Copy link
Contributor

@orivej orivej Jun 3, 2018

Choose a reason for hiding this comment

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

I don't think that individual packages built with CMake should switch to Ninja without a good reason; however I'd mildly approve switching all CMake projects in Nixpkgs to Ninja by default. The upsides of Ninja are possibly faster build, more concise output, better debugability (especially with issues of parallel building) due to the ability to query the build graph, but an irksome downside is that console output (compiler warnings and errors) is not colorized.

@vbgl
Copy link
Contributor

vbgl commented Nov 15, 2018

There are still a few interesting patches in this PR: 3d637bb2eb9344665ca926fc60a25b7d4a3a6cfb, f82df4b90a0a4299ed24f01140e583b94a084f30, 161521544485292924b1fb0483e81d55e3b76b47 and b08af8c52b731107ffdccff2f294fd54f251c78f. @pbogdan could you please rebase this on master and remove the patches that are no longer relevant, so that we can test & merge? Thanks.

@Mic92
Copy link
Member

Mic92 commented Nov 15, 2018

cc @Zimmi48 coq_8_3 is still maintained right?

@vbgl
Copy link
Contributor

vbgl commented Nov 15, 2018

coq_8_3 has been removed from nixpkgs there: #48053.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: coq2html, lensfun, ngrep

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/bx86kap9006ph5gx73q90n3k82g95h24-lensfun-0.3.95
shrinking /nix/store/bx86kap9006ph5gx73q90n3k82g95h24-lensfun-0.3.95/lib/liblensfun.so.0.3.95
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/bx86kap9006ph5gx73q90n3k82g95h24-lensfun-0.3.95/lib  /nix/store/bx86kap9006ph5gx73q90n3k82g95h24-lensfun-0.3.95/bin
patching script interpreter paths in /nix/store/bx86kap9006ph5gx73q90n3k82g95h24-lensfun-0.3.95
/nix/store/bx86kap9006ph5gx73q90n3k82g95h24-lensfun-0.3.95/bin/g-lensfun-update-data: interpreter directive changed from "/usr/bin/env sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/bx86kap9006ph5gx73q90n3k82g95h24-lensfun-0.3.95...
/nix/store/vb35xm30x7hym6avplmdmy4g67bfsyi2-coq2html-20170720
/nix/store/bx86kap9006ph5gx73q90n3k82g95h24-lensfun-0.3.95
/nix/store/fh1rzbwhzfxkp8islshfy8s56czplfmw-ngrep-1.47

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: coq2html, lensfun, ngrep

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/qpg125j40pqjzlbr35mcdcnlpakflz97-ngrep-1.47
shrinking /nix/store/qpg125j40pqjzlbr35mcdcnlpakflz97-ngrep-1.47/bin/ngrep
gzipping man pages under /nix/store/qpg125j40pqjzlbr35mcdcnlpakflz97-ngrep-1.47/share/man/
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/qpg125j40pqjzlbr35mcdcnlpakflz97-ngrep-1.47/bin
patching script interpreter paths in /nix/store/qpg125j40pqjzlbr35mcdcnlpakflz97-ngrep-1.47
checking for references to /build in /nix/store/qpg125j40pqjzlbr35mcdcnlpakflz97-ngrep-1.47...
/nix/store/w5cjcb9r725id2qfa74k3npczrlj2icb-coq2html-20170720
/nix/store/f9manfq0k6vw9x445ssvwcl8jx2y4f3w-lensfun-0.3.95
/nix/store/qpg125j40pqjzlbr35mcdcnlpakflz97-ngrep-1.47

@Mic92 Mic92 merged commit 3516b2d into NixOS:master Nov 15, 2018
@pbogdan pbogdan deleted the gnumake3-remove branch December 3, 2019 17:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants