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

Only include expat.h when XMP is enabled. #1972

Merged

Conversation

kevinbackhouse
Copy link
Collaborator

Fixes: #1971

@kevinbackhouse
Copy link
Collaborator Author

@clanmills: this is a very simple fix to make sure that the build succeeds when XMP is off and expat isn't installed. I think it might be worth including in 0.27.5.

@kevinbackhouse kevinbackhouse added the forward-to-main Forward changes in a 0.28.x PR to main with Mergify label Oct 19, 2021
@kevinbackhouse kevinbackhouse added this to the v0.27.5 milestone Oct 19, 2021
@clanmills
Copy link
Collaborator

I agree. Let's put that into v0.27.5.

@codecov
Copy link

codecov bot commented Oct 19, 2021

Codecov Report

Merging #1972 (03cc591) into 0.27-maintenance (d3f7e92) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@                Coverage Diff                @@
##           0.27-maintenance    #1972   +/-   ##
=================================================
  Coverage             46.32%   46.32%           
=================================================
  Files                   146      146           
  Lines                 22950    22950           
  Branches              11781    11781           
=================================================
  Hits                  10632    10632           
  Misses                 6702     6702           
  Partials               5616     5616           
Impacted Files Coverage Δ
src/xmp.cpp 59.67% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d3f7e92...03cc591. Read the comment docs.

@clanmills
Copy link
Collaborator

I see this is suffering the macOS -fstack-clash-protection misery. I'll merge it anyway and fix the build misery elsewhere.

@clanmills clanmills merged commit 9259374 into Exiv2:0.27-maintenance Oct 19, 2021
@kevinbackhouse kevinbackhouse linked an issue Oct 19, 2021 that may be closed by this pull request
@clanmills clanmills mentioned this pull request Oct 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build forward-to-main Forward changes in a 0.28.x PR to main with Mergify
Projects
None yet
Development

Successfully merging this pull request may close these issues.

EXIV2_ENABLE_XMP=Off incorrectly uses #include <expat.h>
2 participants