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.

Sign up for GitHub

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

Jump to bottom

Actually use the patched libelfin version #6480

Merged
merged 1 commit into from
Jun 5, 2020
Merged

Actually use the patched libelfin version #6480

merged 1 commit into from
Jun 5, 2020

Conversation

Smjert
Copy link
Member

@Smjert Smjert commented Jun 4, 2020

This is a followup of PR #6472,
while the code was patched we were still using the unpatched version.
This should finally fix ossfuzz build failure.

@Smjert
Actually use the patched libelfin version
75cdf9b 
This is a followup of PR osquery#6472,
while the code was patched we were still using the unpatched version.
This should finally fix ossfuzz build failure.
@Smjert Smjert added build libraries For things referring to osquery third party libraries oss-fuzz Issues related to integrations with oss-fuzz. labels Jun 4, 2020
@Smjert
Copy link
Member Author

Smjert commented Jun 4, 2020 •
edited

A small slip up, sorry.
When I introduced the patching system I had already created a system where the path to the library source code is generated and put into OSQUERY_<library_name>_ROOT_DIR, so no matter if there was a patch or not that was correct and there was less to touch.
Unfortunately there were a couple of details about it that I have to re-explore, that were not making it possible to just substitute all our usages of CMAKE_CURRENT_BINARY_DIR and friends with the generated variable, so I went for manually changing the vars when needed.

I will eventually have to revisit it to see if I can automate it as originally intended.

@theopolis theopolis merged commit c691ac6 into osquery:master Jun 5, 2020
@Smjert Smjert deleted the stefano/libs/use-patched-libelfin branch June 26, 2020 12:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@theopolis theopolis theopolis approved these changes

Assignees
No one assigned
Labels
build libraries For things referring to osquery third party libraries oss-fuzz Issues related to integrations with oss-fuzz.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Smjert @theopolis