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

bottle: Skip matches to files in build deps #5366

Merged
merged 1 commit into from Dec 3, 2018

Conversation

sjackman
Copy link
Member

@sjackman sjackman commented Dec 2, 2018

Files in build dependencies are not required at run time.

  • Have you followed the guidelines in our Contributing document?
  • Have you checked to ensure there aren't other open Pull Requests for the same change?
  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your changes? Here's an example.
  • Have you successfully run brew style with your changes locally?
  • Have you successfully run brew tests with your changes locally?

This PR addresses the issue that topgrade is detected as being non-relocatable on macOS, when it ought to be cellar :any_skip_relocation.
For details see #5365 (comment)
cc @iMichka

Copy link
Member

@MikeMcQuaid MikeMcQuaid left a comment

Choose a reason for hiding this comment

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

Seems like a good approach, nice work 👍

@@ -178,6 +178,18 @@ def keg_contain?(string, keg, ignores)
offset, match = str.split(" ", 2)
next if linked_libraries.include? match # Don't bother reporting a string if it was found by otool

# Do not report matches to directories that do not exist.
Copy link
Member

Choose a reason for hiding this comment

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

Could this just check for paths that don't exist? Seems like it might be more specific and therefore more likely to find cellar :any relocations.

Copy link
Member Author

Choose a reason for hiding this comment

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

Sure


# Do not report matches to build dependencies.
begin
keg_name = Keg.for(dir).name
Copy link
Member

Choose a reason for hiding this comment

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

Does this match cases where it's a random path inside a Keg rather than the actual keg?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes

# Do not report matches to build dependencies.
begin
keg_name = Keg.for(dir).name
next unless @runtime_deps.include? keg_name
Copy link
Member

Choose a reason for hiding this comment

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

Could this be passed through as an argument (to keg_contain?) instead? More obvious to me than relying on a instance variable declared elsewhere.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done.

@sjackman sjackman force-pushed the bottle branch 2 times, most recently from 2c21d35 to 47d43d8 Compare December 2, 2018 19:58
@sjackman
Copy link
Member Author

sjackman commented Dec 2, 2018

Seems like a good approach, nice work 👍

Thanks, Mike!

next unless File.exist? match

# Do not report matches to build dependencies.
if runtime_deps && !runtime_deps.empty?
Copy link
Member

Choose a reason for hiding this comment

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

Make runtime_deps = [] by default or use if runtime_deps.present?

Copy link
Member Author

Choose a reason for hiding this comment

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

I didn't know about .present?. Nice!

@@ -272,6 +285,7 @@ def bottle_formula(f)

ohai "Bottling #{filename}..."

runtime_deps = [f.name] + f.runtime_dependencies.map(&:name)
Copy link
Member

Choose a reason for hiding this comment

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

formula_and_runtime_deps_names?

Files in build dependencies are not required at run time.
@sjackman
Copy link
Member Author

sjackman commented Dec 3, 2018

@MikeMcQuaid Good to merge?

@sjackman
Copy link
Member Author

sjackman commented Dec 3, 2018

Merged. Thanks for the review, Mike!

@sjackman sjackman merged commit 704e857 into Homebrew:master Dec 3, 2018
@sjackman sjackman deleted the bottle branch December 3, 2018 16:00
@lock lock bot added the outdated PR was locked due to age label Jan 2, 2019
@lock lock bot locked as resolved and limited conversation to collaborators Jan 2, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
outdated PR was locked due to age
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants