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

sci-mathematics/acl2: Fix sed expression, clearer books install #1115

Closed
wants to merge 1 commit into from
Closed

Conversation

lucasmitrak
Copy link
Contributor

  • Fix sed expression which does not execute at all
  • Move books down to original install location

Currently, the sed expression
/5/a export ACL2_SYSTEM_BOOKS=/usr/share/acl2/books/ does not modify
the acl2 executable script. The sed expression's intended behavior
seems to be adding the enviroment variable ACL2_SYSTEM_BOOKS to the
fifth line on the final script; however, no modification is made.
A new sed expression must replace it, namely
5iexport ACL2_SYSTEM_BOOKS=/usr/share/acl2/books/ which accomplishes
inserting the enviroment variable into the script. This enviroment
variable is recommended when the books directory resides outside
where the executable was built [1].
In addition, the command doins -r books should be moved further down
for the sake of clarity. This way the src_install() function modifies
the files at the top and installs them at the bottom. Also, now
the command doins -r books is beside the other similar commands.

[1] https://raw.githubusercontent.com/acl2/acl2/master/doc.lisp

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Lucas Mitrak lucas@lucasmitrak.com

* Fix sed expression which does not execute at all
* Move books down to original install location

Currently, the sed expression
`/5/a export ACL2_SYSTEM_BOOKS=/usr/share/acl2/books/` does not modify
the acl2 executable script. The sed expression's intended behavior
seems to be adding the enviroment variable `ACL2_SYSTEM_BOOKS` to the
fifth line on the final script; however, no modification is made.
A new sed expression must replace it, namely
`5iexport ACL2_SYSTEM_BOOKS=/usr/share/acl2/books/` which accomplishes
inserting the enviroment variable into the script. This enviroment
variable is recommended when the books directory resides outside
where the executable was built [1].
In addition, the command `doins -r books` should be moved further down
for the sake of clarity. This way the src_install() function modifies
the files at the top and installs them at the bottom. Also, now
the command `doins -r books` is beside the other similar commands.

[1] https://raw.githubusercontent.com/acl2/acl2/master/doc.lisp

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Lucas Mitrak <lucas@lucasmitrak.com>
@lucasmitrak
Copy link
Contributor Author

lucasmitrak commented Oct 1, 2021

This should be my last PR for acl2. I think I finally fixed everything.

@lucasmitrak
Copy link
Contributor Author

Another note is that the patch file for this package was submitted and accepted upstream [1] so the next version will hopefully not need it.
[1] acl2/acl2#1318

@gentoo-bot gentoo-bot closed this in a068c3f Oct 7, 2021
@AndrewAmmerlaan
Copy link
Member

Thanks 👍

@lucasmitrak lucasmitrak deleted the acl2 branch October 7, 2021 19:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants