-
Notifications
You must be signed in to change notification settings - Fork 149
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
Refactor and further simplify the build script #64
base: master
Are you sure you want to change the base?
Conversation
It doesn't build anymore
|
@Issam-b please apply
|
@bog-dan-ro did you try all the commits, that part for using $ss_version in the switch is already at 7646d9c#diff-fb2021ccb7382cface7486855f6512a35fd4e0640987eda5d51d1f65947652d0R117 |
|
Those are some older commits, and doesn't look like the commits in this PR |
* The script now supports zsh and bash to allow building from macOS and Linux with builtin zsh and bash version 3 or 4. * It now uses curl instead of wget, wget is not builtin on macOS. * Use the default NDk path from the Android SDK. * Allow to set custom build and output folders. * The various build folders for each version are now kept around under the 'build' folder. * At the same time add the build folder to .gitignore. * Create relative symlinks KDAB#61.
OpenSSL has the configuration option shlib_variant, so we can use that instead. This works for version 1.x and 3.x, so it would make the build script more similar between the two versions. Also, this avoid issues that can come from patchelf, as this patch comes after a bug found in patchelf 0.18 that created wrongly aligned libraries. See NixOS/patchelf#492.
It's a simple check at runtime to see if ssl is supported using the included libs.
Last push add 'bash -x', and actually allow passing custom build, output and ndk params to the script. |
@bog-dan-ro a colleague tried this PR on Linux and it worked as expected. From the error you got it seems that you're not using the commits from this PR. Could you give this another try? |
This patch contains many changes, ideally more atomic changes, but since it touches most of the script and how it works, it's easier to put it all like this with 4 commits. The changes include the following changes: