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

fix(build): fix civetweb linking in cmake module #1919

Merged

Conversation

LucaGuerra
Copy link
Contributor

Signed-off-by: Luca Guerra luca@guerra.sh
Co-authored-by: Federico Di Pierro nierro92@gmail.com

What type of PR is this?

Uncomment one (or more) /kind <> lines:

/kind bug

/kind cleanup

/kind design

/kind documentation

/kind failing-test

/kind feature

If contributing rules or changes to rules, please make sure to also uncomment one of the following line:

/kind rule-update

/kind rule-create

Any specific area of the project related to this PR?

Uncomment one (or more) /area <> lines:

/area build

/area engine

/area rules

/area tests

/area proposals

What this PR does / why we need it:

On Debian or Ubuntu systems it is possible that the GNU Install dir LIBDIR (CMAKE_INSTALL_LIBDIR) can be different depending on the install prefix chosen (https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html) . This can create issues when trying to compute the civetweb lib path using the main CMakeFile CMAKE_INSTALL_LIBDIR, leading to linking errors like:

make[2]: *** No rule to make target 'civetweb-prefix/src/civetweb/install/lib/x86_64-linux-gnu/libcivetweb.a', needed by 'userspace/falco/falco'.  Stop.

This forces the install directory to lib so it's possible to deterministically compute the path.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

Signed-off-by: Luca Guerra <luca@guerra.sh>
Co-authored-by: Federico Di Pierro <nierro92@gmail.com>
Copy link
Contributor

@jasondellaluce jasondellaluce left a comment

Choose a reason for hiding this comment

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

/approve

💘

@poiana
Copy link

poiana commented Feb 28, 2022

LGTM label has been added.

Git tree hash: 1fe84e17c60614873f6be4da8a7ba376dfd4d008

@leogr
Copy link
Member

leogr commented Mar 1, 2022

/milestone 0.32.0

@poiana poiana added this to the 0.32.0 milestone Mar 1, 2022
Copy link
Member

@leogr leogr left a comment

Choose a reason for hiding this comment

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

/approve

@poiana
Copy link

poiana commented Mar 1, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jasondellaluce, leogr, LucaGuerra

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [jasondellaluce,leogr]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@poiana poiana merged commit 4d29b87 into falcosecurity:master Mar 1, 2022
@jasondellaluce jasondellaluce modified the milestones: 0.32.0, 0.31.1 Mar 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants