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

Meson: Fix building conntest sample without curl (backport #2964) #2974

Merged
merged 1 commit into from
May 17, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 17, 2024

Somewhat related to #2963 and #2961

When building with Meson the dependency logic made it impossible to build the conntest sample without curl, even though webready can be enabled in a limited, http://-only mode that doesn't require curl.

This PR separates the curl_dep dependency for libcurl from the web_dep dependency that indicates whether the webready option is enabled, in the meson configuration. The latter is now used both to determine whether EXV_ENABLE_WEBREADY should be defined, and whether conntest should be built at all.

When web_dep represents a webready-enabled configuration, curl_dep is set as a dependency. Anything depending on web_dep (currently only conntest) will be linked with libcurl iff it's available.


This is an automatic backport of pull request #2964 done by Mergify.

Copy link
Contributor Author

mergify bot commented May 17, 2024

Cherry-pick of ebd4e44 has failed:

On branch mergify/bp/0.28.x/pr-2964
Your branch is up to date with 'origin/0.28.x'.

You are currently cherry-picking commit ebd4e4400.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   meson.build

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@kmilos kmilos force-pushed the mergify/bp/0.28.x/pr-2964 branch from afc1569 to b72a7bb Compare May 17, 2024 09:04
@kmilos kmilos added this to the v0.28.3 milestone May 17, 2024
@kmilos kmilos merged commit ca35182 into 0.28.x May 17, 2024
59 of 60 checks passed
@kmilos kmilos removed the conflicts label May 17, 2024
@mergify mergify bot deleted the mergify/bp/0.28.x/pr-2964 branch May 17, 2024 09:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants