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

curl: add 8.0.1 #1149

Merged
merged 1 commit into from
Sep 16, 2023
Merged

curl: add 8.0.1 #1149

merged 1 commit into from
Sep 16, 2023

Conversation

benoit-pierre
Copy link
Contributor

@benoit-pierre benoit-pierre commented Sep 9, 2023

Note:

  • not the latest version (8.0.1 is from 2023, latest is 8.2.1 released July 2023), because that's what I started with.
  • advanced / experimental options are not supported: Unicode (Windows), HTTP/3, Hyper HTTP backend, WebSocket…
  • not all SSL backends are supported: only OpenSSL, Secure Channel (Windows), and Secure Transport (Windows)
  • not all LDAP providers are supported: only OpenLDAP >= 2.4.48 (2019) and Windows.

Close #561.

@xclaesse
Copy link
Member

xclaesse commented Sep 9, 2023

8.0.1 is from 2013, latest is 8.2.1 released July 2013

You mean 2023 or it had no release in 10 years?

@benoit-pierre
Copy link
Contributor Author

8.0.1 is from 2013, latest is 8.2.1 released July 2013

You mean 2023 or it had no release in 10 years?

2023, of course…

@neheb
Copy link
Collaborator

neheb commented Sep 9, 2023

so a bunch of packages are not set to be built on MSVC because of missing curl. Would be interesting to undo that and see if they build.

@benoit-pierre benoit-pierre marked this pull request as draft September 9, 2023 23:50
@benoit-pierre
Copy link
Contributor Author

so a bunch of packages are not set to be built on MSVC because of missing curl. Would be interesting to undo that and see if they build.

Those packages would need an explicit subproject/curl.wrap file, no?

@neheb
Copy link
Collaborator

neheb commented Sep 9, 2023

well, this PR provides it.

@benoit-pierre
Copy link
Contributor Author

Oh, right, the superproject provides it.

@benoit-pierre
Copy link
Contributor Author

benoit-pierre commented Sep 9, 2023

So let's say I want to test if cpr now builds, and patch-out "build_on": { "windows": false } in ci_config.json, do I need to bump the revision in releases.json too?

@neheb
Copy link
Collaborator

neheb commented Sep 10, 2023

In order to get it tested in this PR, yes. A commit like that can be removed prior to merging.

'c',
version: '8.0.1',
# Version gated use of `test(…, verbose: true)` needs `0.62.0`.
meson_version: meson.version().version_compare('>=0.62.0') ? '>=0.62.0' : '>=0.60.0',
Copy link
Collaborator

Choose a reason for hiding this comment

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

that is...fascinating. I remember doing something like this with an older meson version and got an error. Can't remember which it was. I'd just set to 0.62.0 personally.

Copy link
Collaborator

Choose a reason for hiding this comment

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

actually, why is verbose: true even needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The whole curl testsuite is run by tests/runtests.pl, so from meson's point of view, there's only one test. And said test can take a while, so verbose output is a much nicer default.


_headerlist = {
'arpa/inet.h': [
'getpeername',
Copy link
Collaborator

Choose a reason for hiding this comment

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

that is so hard to read. Maybe put the array on the same line.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's easier as soon as they are multiple functions, and muon fmt will automatically switch to multiple-lines in that case anyway. I try to limit my fighting with its choices.

@neheb
Copy link
Collaborator

neheb commented Sep 10, 2023

I'd remove liblastfm from the test commit. It's known broken on Windows. I need to fix it at some point.

@benoit-pierre
Copy link
Contributor Author

Looks like the libupnp build is broken with msvc too.

@neheb
Copy link
Collaborator

neheb commented Sep 10, 2023

ah right. libupnp needs some special threading library that I never bothered with.

@benoit-pierre benoit-pierre marked this pull request as ready for review September 10, 2023 01:40
@benoit-pierre benoit-pierre force-pushed the pr/add_curl branch 3 times, most recently from 14552de to 3556843 Compare September 10, 2023 02:30
@neheb neheb merged commit 60a4e43 into mesonbuild:master Sep 16, 2023
7 checks passed
@benoit-pierre benoit-pierre deleted the pr/add_curl branch September 16, 2023 06:35
@neheb
Copy link
Collaborator

neheb commented Sep 17, 2023

first casualty:

2023-09-17T04:36:03.7999038Z D:\a\wrapdb\wrapdb\subprojects\libmicrohttpd-0.9.77\src\include\microhttpd.h(126): error C2371: 'ssize_t': redefinition; different basic types
2023-09-17T04:36:03.7999720Z D:\a\wrapdb\wrapdb\subprojects\libnpupnp-5.0.1\src\inc\config.h(43): note: see declaration of 'ssize_t'

The problem here is that libmicrohttpd defines it as ptrdiff_t whereas this defines it as __int64. Should be the former I think.

@neheb
Copy link
Collaborator

neheb commented Sep 17, 2023

meson -Dwraps=libmicrohttpd,curl a

subprojects/curl-8.0.1/lib/meson.build:217:6: ERROR: Tried to override dependency 'libcurl' which has already been resolved or overridden at /home/mangix/devstuff/wrapdb/subprojects/libmicrohttpd-0.9.77/meson.build:181:

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.

Request: libcurl
3 participants