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

Two minor build fixes #445

Merged
merged 2 commits into from
Feb 6, 2025
Merged

Two minor build fixes #445

merged 2 commits into from
Feb 6, 2025

Conversation

OlCe2
Copy link
Contributor

@OlCe2 OlCe2 commented Jan 13, 2025

No description provided.

@kelson42 kelson42 added this to the 3.6.0 milestone Jan 13, 2025
Copy link
Collaborator

@veloman-yunkan veloman-yunkan left a comment

Choose a reason for hiding this comment

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

LGTM

@kelson42
Copy link
Contributor

kelson42 commented Feb 3, 2025

@OlCe2 Thank you for your PR and sorry for the late merge

@kelson42
Copy link
Contributor

kelson42 commented Feb 3, 2025

Copy link

codecov bot commented Feb 3, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 27.70%. Comparing base (f26871f) to head (91e932c).
Report is 3 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #445   +/-   ##
=======================================
  Coverage   27.70%   27.70%           
=======================================
  Files          26       26           
  Lines        2534     2534           
  Branches     1363     1363           
=======================================
  Hits          702      702           
  Misses       1325     1325           
  Partials      507      507           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@OlCe2
Copy link
Contributor Author

OlCe2 commented Feb 6, 2025

It seems we have still a small problem

Oh, my... Meson in the CI is at version 0.49.2, released in February 2019... It seems that multiline statements were not supported up to version 50.0. Are you planning to upgrade it soon? I can certainly change the commits to avoid line wrapping in the meantime.

OlCe2 added 2 commits February 7, 2025 00:47
The dependency on libzim must be specified in compiler.has_header_symbol() for
it to find the header in all cases (i.e., also when not installed in locations
the compiler considers standard).

This is essentially the same fix as was done earlier in libzim.
On FreeBSD, LLVM's libc++ also relies on pthread.

zimcheck's 'meson.build' would use the same 'thread_dep' variable set in the
root 'meson.build' file on building zimwriterfs, crushing the value set there in
some cases, which would then be used in zimwriterfs' 'meson.build'.

Note: Some of the introduced line is very long but has not been wrapped as Meson
0.49.2 is still used in the MacOS CI and it does not not support continuing
lines with '\'.
@kelson42 kelson42 merged commit 870a087 into openzim:main Feb 6, 2025
10 checks passed
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.

3 participants