Skip to content

Commit e2a1884

Browse files
committed
Simplifications and cleanup to the build script
* 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.
1 parent 57056d6 commit e2a1884

File tree

3 files changed

+200
-131
lines changed

3 files changed

+200
-131
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
build/
2+
.DS_Store

README.md

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ OpenSSL scripts and binaries for Android (useful for Qt Android apps)
44
In this repo you can find the prebuilt OpenSSL libs for Android, a QMake include project `.pri` file that can be used integrated with Qt projects, and a `.cmake` file for CMake based projects.
55

66
The following directories are available
7-
* `ssl_3`: used for Qt 6.5.0+.
7+
* `ssl_3`: for Qt 6.5.0+.
88
* `ssl_1_1`: for Qt Qt 5.12.5+, 5.13.1+, 5.14.0+, 5.15.0+, Qt 6.x.x up to 6.4.x
99

1010
## How to use it
@@ -23,7 +23,7 @@ if (ANDROID)
2323
FetchContent_Declare(
2424
android_openssl
2525
DOWNLOAD_EXTRACT_TIMESTAMP true
26-
URL https://github.com/KDAB/android_openssl/archive/refs/heads/master.zip
26+
URL https://github.com/KDAB/android_openssl/archive/refs/heads/master.zip
2727
# URL_HASH MD5=c97d6ad774fab16be63b0ab40f78d945 #optional
2828
)
2929
FetchContent_MakeAvailable(android_openssl)
@@ -51,14 +51,11 @@ endif()
5151
## Build Script
5252

5353
The build script `build_ssl.sh` can be used to rebuild the OpenSSL libraries. Since specific
54-
versions might depend or work better with specific NDK versions, the OpenSSL<==>NDK version
54+
versions might depend or work better with specific NDK versions, the OpenSSL/NDK version
5555
combinations are defined in the script. Before running the script, check that the NDK paths
5656
are correct for your environment.
5757

5858
### Build Prerequisites
5959

60-
Both Linux, macOS need `patchelf` command when building for OpenSSL 3+.
61-
62-
Additionally, for macOS you need:
63-
- `bash` shell version 4+ is required
64-
- `wget` command
60+
The build script was tested against `bash` and `zsh` on Linux and macOS.
61+
The `patchelf` command is required when building for OpenSSL 3.

0 commit comments

Comments
 (0)