fix configure for more modern build targets and users #121
Conversation
This file contains hidden or 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
- QoL logic to use $ANDROID_NDK_HOME over $ANDROID_NDK, which is old and no longer used - Changed assumed android ndk paths from x86 to x86_64 - Added check to make sure ANDROIDBIN actually set $CC properly - Added aarch64 and arm-v7a as a build target - Changed armeabi to armv5te because it hasn't been valid since the config.sub regen in festvox@d1402af - Updated GCC to 4.9, because this is what r10e ships with - Updated target to sdk21, nearly no one is going to be on android 4<
alexytomi
force-pushed
the
android-fixes
branch
from
34d7097 to
632910b
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Changes
Why?
Because this was a headache to try and compile properly. I didn't dare deviate from the prescribed ndk version of the Flite-TTS-Engine-for-Android project for fear of unforeseen issues popping up.
Since most machines nowadays are 64-bit, including github runners, I think it's safe to say this is a better assumption. I've only added things elsewhere.
I reran
autoreconfhere, am unsure whyinstall-shhadn't been updated like ever, all the configure scripts are using different versions, this looks like a bad idea.The change with GCC version being bumped does seem a bit much if it is for backwards compatibility though, but then again, no official bin download for r10d exists anymore to my knowledge, could rework this change if r10d or not bumping GCC versions is needed for some reason.