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

ccache: rework forumula to build without build options #19468

Merged
merged 2 commits into from
Oct 19, 2017
Merged

ccache: rework forumula to build without build options #19468

merged 2 commits into from
Oct 19, 2017

Conversation

Git-Jiro
Copy link
Contributor

  • Have you followed the guidelines for contributing?
  • Have you checked that there aren't other open pull requests for the same formula update/change?
  • Have you built your formula locally with brew install --build-from-source <formula>, where <formula> is the name of the formula you're submitting?
  • Does your build pass brew audit --strict <formula> (after doing brew install <formula>)?

This PR should fix ccache related issues related to: #13133

@ilovezfs This solution works with ccache --HEAD as well.

@Git-Jiro
Copy link
Contributor Author

I just noticed, maybe this solution would work as well here: #6402

@Git-Jiro Git-Jiro closed this Oct 15, 2017
@Git-Jiro Git-Jiro reopened this Oct 15, 2017
@Git-Jiro
Copy link
Contributor Author

Yes, this solution seem to apply here as well: #6402

@ilovezfs
Copy link
Contributor

@Git-Jiro yeah the question is whether asciidoc built --with-docbook-xsl is actually itself any different from asciidoc built without the option, or if the only difference is the extra dependency itself. I've been suspecting for some time it may be the latter, in which case this would be the correct solution, and we could probably remove the option from asciidoc too.

@Git-Jiro
Copy link
Contributor Author

In case of ccache (and makepkg) both solutions seem to be viable.

@apjanke
Copy link
Contributor

apjanke commented Oct 17, 2017

I believe the only difference for asciidoc --with-docbook-xsl is the dependency. I installed it locally from source using both the default options and --with-docbook-xsl, and the only difference in the installed files is in brew's own INSTALL_RECEIPT.

[~/tmp/asciidoc-with-xsl]
$ diff -r default with-docbook-xsl
diff -r default/asciidoc/8.6.9_1/INSTALL_RECEIPT.json with-docbook-xsl/asciidoc/8.6.9_1/INSTALL_RECEIPT.json
1c1
< {"homebrew_version":"1.3.5-26-gcf34901","used_options":[],"unused_options":["--with-docbook-xsl"],"built_as_bottle":false,"poured_from_bottle":false,"installed_as_dependency":false,"installed_on_request":true,"changed_files":null,"time":1508277128,"source_modified_time":1383773580,"HEAD":"cf349018d5cc508ddd2bd0797df47688b9f7346b","stdlib":null,"compiler":"clang","aliases":[],"runtime_dependencies":[{"full_name":"docbook","version":"5.0"}],"source":{"path":"/usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/asciidoc.rb","tap":"homebrew/core","spec":"stable","versions":{"stable":"8.6.9","devel":null,"head":"HEAD","version_scheme":0}}}
\ No newline at end of file
---
> {"homebrew_version":"1.3.5-26-gcf34901","used_options":["--with-docbook-xsl"],"unused_options":[],"built_as_bottle":false,"poured_from_bottle":false,"installed_as_dependency":false,"installed_on_request":true,"changed_files":null,"time":1508277006,"source_modified_time":1383773580,"HEAD":"cf349018d5cc508ddd2bd0797df47688b9f7346b","stdlib":null,"compiler":"clang","aliases":[],"runtime_dependencies":[{"full_name":"docbook","version":"5.0"},{"full_name":"docbook-xsl","version":"1.79.1"}],"source":{"path":"/usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/asciidoc.rb","tap":"homebrew/core","spec":"stable","versions":{"stable":"8.6.9","devel":null,"head":"HEAD","version_scheme":0}}}
\ No newline at end of file
[✘ ~/tmp/asciidoc-with-xsl]
$

@Git-Jiro
Copy link
Contributor Author

@apjanke @ilovezfs that sounds like the "with-docbook-xsl" option of asciidoc was unnecessary in the first place?

@JCount JCount changed the title Rework Forumulae to build ccache without build options ccache: rework forumula to build without build options Oct 19, 2017
@JCount JCount merged commit 85a7f88 into Homebrew:master Oct 19, 2017
@JCount
Copy link
Contributor

JCount commented Oct 19, 2017

@Git-Jiro Thank you for the PR!! 😄

@Git-Jiro Git-Jiro deleted the remove_build_dependency_with_option_from_ccache branch October 19, 2017 03:45
@ilovezfs ilovezfs mentioned this pull request Nov 3, 2017
@Homebrew Homebrew locked and limited conversation to collaborators May 4, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants