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

luajit: do not override INSTALL_INC #30808

Merged
merged 1 commit into from Nov 22, 2017

Conversation

andir
Copy link
Member

@andir andir commented Oct 25, 2017

Overriding INSTALL_INC caused luajit to be installed directly into the
include/ directory instead of include/luajit-${version} as normally
expected. Previously the path indicated in the pkg-config file also did
not match the actual header file location.

Since luajit is expected to work as a drop-in replacement for standard lua the include files in include/ are retained via symlinks to the sub-directory.

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)
    This changes tries to recompile everything that could possible be bundled with luajit. Many of those packages already failed before this change so I am not able to guarantee that everything does still compile/execute.
  • 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.

Overriding INSTALL_INC caused luajit to be installed directly into the
`include/` directory instead of `include/luajit-${version}` as normally
expected. Previously the path indicated in the pkg-config file also did
not match the actual header file location.
@vyp
Copy link
Member

vyp commented Oct 26, 2017

This changes tries to recompile everything that could possible be bundled with luajit. Many of those packages already failed before this change so I am not able to guarantee that everything does still compile/execute.

The lua packages that do not currently work with luajit are luaexpat, luazip, cjson and mpack. All the rest work last time I checked.

@andir
Copy link
Member Author

andir commented Oct 26, 2017

I only saw a large list of rebuilds and cjson did fail (with and without my change) so I assumed there will be others too. It probably is just the list of packages you mentioned.

@vyp
Copy link
Member

vyp commented Oct 28, 2017

PSA I'll test this with the rest of the luajit packages hopefully either tomorrow or the day after if no one else does. 👍

@andir
Copy link
Member Author

andir commented Oct 31, 2017

@vyp any news? :-)

@vyp
Copy link
Member

vyp commented Nov 1, 2017

@andir Sorry forgot to update, time escaped me actually, been really busy. I don't have time to test this until Sunday unfortunately. Of course, if anyone else wants to test before that, they're free to go ahead and not be dependent on me! (I just thought I could help.)

@andir
Copy link
Member Author

andir commented Nov 21, 2017

@thoughtpolice @smironov @vcunat any of you guys (since you are the current maintainers) able to verify this?

@Mic92 Mic92 merged commit acfd95a into NixOS:master Nov 22, 2017
@andir andir deleted the fix-luajit-include-directory branch November 22, 2017 14:00
@orivej
Copy link
Contributor

orivej commented Nov 27, 2017

You forgot to symlink lua.hpp and this broke solarus (at least). Fixed in b00c651.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants