Skip to content

Fix #15395: libarchive build fails for x86_windows_v120#15799

Closed
Olernov wants to merge 1 commit intomicrosoft:masterfrom
Olernov:fix_libarchive_build_x86_windows_v120
Closed

Fix #15395: libarchive build fails for x86_windows_v120#15799
Olernov wants to merge 1 commit intomicrosoft:masterfrom
Olernov:fix_libarchive_build_x86_windows_v120

Conversation

@Olernov
Copy link

@Olernov Olernov commented Jan 21, 2021

Build fails on compiling xxhash.c having a fuction with "inline" specifier.
"inline" is a c99 keyword and c99 is not yet (fully) supported with MSVC toolset v120:
"The inline keyword is available only in C++. The __inline and __forceinline
keywords are available in both C and C++. For compatibility with previous versions,
_inline is a synonym for __inline."
(Source: http://msdn.microsoft.com/en-us/library/z8y1yy88.aspx)

This fix adds a patch that replaces "inline" with "__inline" in xxhash.c

Describe the pull request

  • What does your PR fix? Fixes #

  • Which triplets are supported/not supported? Have you updated the CI baseline?

  • Does your PR follow the maintainer guide?

Build fails on compiling xxhash.c having a fuction with "inline" specifier.
"inline" is a c99 keyword and c99 is not yet (fully) supported with MSVC toolset v120:
"The inline keyword is available only in C++. The __inline and __forceinline
keywords are available in both C and C++. For compatibility with previous versions,
_inline is a synonym for __inline."
(Source: http://msdn.microsoft.com/en-us/library/z8y1yy88.aspx)

This fix adds a patch that replaces "inline" with "__inline" in xxhash.c
@ghost
Copy link

ghost commented Jan 21, 2021

CLA assistant check
All CLA requirements met.

@JackBoosY JackBoosY self-assigned this Jan 22, 2021
@JackBoosY JackBoosY added the category:community-triplet A PR or issue related to community triplets not officially validated by the vcpkg team. label Jan 22, 2021
@JackBoosY
Copy link
Contributor

Hi @Olernov, thanks for this PR!
Can you report this issue to the upstream and wait for official approval?

Thanks.

@JackBoosY JackBoosY added depends:upstream-changes Waiting on a change to the upstream project requires:author-response labels Jan 22, 2021
@Olernov
Copy link
Author

Olernov commented Jan 22, 2021

@JackBoosY
Copy link
Contributor

Waiting for official reply.

@Olernov
Copy link
Author

Olernov commented Feb 17, 2021

Libarchive has accepted the pull request libarchive/libarchive#1487. Probably the fix will be included into the next release.

@JackBoosY JackBoosY removed the depends:upstream-changes Waiting on a change to the upstream project label Feb 18, 2021
Copy link
Contributor

@JackBoosY JackBoosY left a comment

Choose a reason for hiding this comment

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

Please bump the port version. See documentation.
Also please run command vcpkg x-add-version --all then commit the changes.

@Olernov
Copy link
Author

Olernov commented Feb 19, 2021

I think we should better wait for the next release of libarchive and then bump the port version, what do you think?

@JackBoosY
Copy link
Contributor

@Olernov Fine.

@JackBoosY JackBoosY marked this pull request as draft February 19, 2021 09:16
@JackBoosY JackBoosY added depends:upstream-changes Waiting on a change to the upstream project and removed requires:author-response labels Feb 19, 2021
@JackBoosY
Copy link
Contributor

So, the upstream merged your changes, can you please merge your branch to master and run x-add-version?

@JackBoosY JackBoosY added requires:author-response and removed depends:upstream-changes Waiting on a change to the upstream project labels Sep 10, 2021
@Olernov
Copy link
Author

Olernov commented Sep 13, 2021

Opened a new PR for this: #20133

@Olernov Olernov closed this Sep 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category:community-triplet A PR or issue related to community triplets not officially validated by the vcpkg team.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants