[zstd][android] Fix build with NDK r27 #4107
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The NDK cross compiler declares the target as __linux (which is not technically incorrect), which triggers the enablement of _GNU_SOURCE in the newly added code that requires the presence of qsort_r() used in the COVER dictionary code. Even though the NDK uses llvm/libc, it doesn't declare qsort_r() in the stdlib.h header. The build fix is to only activate the _GNU_SOURCE macro if the OS is *not* Android, as then we will fallback to the C90 compliant code. This patch should solve the reported issue number facebook#4103.
Cyan4973
approved these changes
Jul 30, 2024
|
@Cyan4973 I've reached out to the Android folks at google and they started the work to actually fix the NDK/AOSP in upcoming future versions: The function signature should be the same as on GNU/Linux systems. |
|
So hopefully in the future when API level 36 is released to the wild, we could actually enable the qsort_r() fix for that API level and fallback to the C90 code for older versions. |
|
Looks good @Adenilson ! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The NDK cross compiler declares the target as __linux (which is not technically incorrect), which triggers the enablement of _GNU_SOURCE in the newly added code that requires the presence of qsort_r() used in the COVER dictionary code.
Even though the NDK uses llvm/libc, it doesn't declare qsort_r() in the stdlib.h header.
The build fix is to only activate the _GNU_SOURCE macro if the OS is not Android, as then we will fallback to the C90 compliant code.
This patch should solve the reported issue number #4103.