From 5baecee3de30071160500f1d50ebaec034600506 Mon Sep 17 00:00:00 2001 From: Luca Carlon Date: Sat, 3 Aug 2024 11:35:14 +0200 Subject: [PATCH] Fix symlinks in the build script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These symlinks were created by the script before this patch: root@4923c457fa27:~/android_openssl/ssl_3/arm64-v8a# tree . ├── include -> ../ssl_3/include ├── libcrypto.a ├── libcrypto.so -> ../ssl_3/arm64-v8a/libcrypto_3.so ├── libcrypto_3.so ├── libssl.a ├── libssl.so -> ../ssl_3/arm64-v8a/libssl_3.so └── libssl_3.so After the fix, this is the result: root@4923c457fa27:~/android_openssl/ssl_3/arm64-v8a# tree . ├── include -> ../../ssl_3/include ├── libcrypto.a ├── libcrypto.so -> libcrypto_3.so ├── libcrypto_3.so ├── libssl.a ├── libssl.so -> libssl_3.so └── libssl_3.so --- build_ssl.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build_ssl.sh b/build_ssl.sh index 096908e..8e86196 100755 --- a/build_ssl.sh +++ b/build_ssl.sh @@ -97,9 +97,9 @@ build_ssl_1_1() { llvm-strip --strip-all libssl_1_1.so cp libcrypto_1_1.so libssl_1_1.so "../$version_out_dir/$qt_arch" || exit 1 cp libcrypto.a libssl.a "../$version_out_dir/$qt_arch" || exit 1 - ln -s "../$version_out_dir/$qt_arch/libcrypto_1_1.so" "../$version_out_dir/$qt_arch/libcrypto.so" - ln -s "../$version_out_dir/$qt_arch/libssl_1_1.so" "../$version_out_dir/$qt_arch/libssl.so" - ln -s "../$version_out_dir/include" "../$version_out_dir/$qt_arch/include" + ln -s "libcrypto_1_1.so" "../$version_out_dir/$qt_arch/libcrypto.so" + ln -s "libssl_1_1.so" "../$version_out_dir/$qt_arch/libssl.so" + ln -s "../../$version_out_dir/include" "../$version_out_dir/$qt_arch/include" } build_ssl_3() { @@ -117,9 +117,9 @@ build_ssl_3() { cp libcrypto.a libssl.a "${out_path}" || exit 1 cp libcrypto.so "${out_path}/libcrypto_3.so" || exit 1 cp libssl.so "${out_path}/libssl_3.so" || exit 1 - ln -s "${out_path}/libcrypto_3.so" "${out_path}/libcrypto.so" - ln -s "${out_path}/libssl_3.so" "${out_path}/libssl.so" - ln -s "../$version_out_dir/include" "../$version_out_dir/$qt_arch/include" + ln -s "libcrypto_3.so" "${out_path}/libcrypto.so" + ln -s "libssl_3.so" "${out_path}/libssl.so" + ln -s "../../$version_out_dir/include" "../$version_out_dir/$qt_arch/include" pushd ${out_path} || exit 1 patchelf --set-soname libcrypto_3.so libcrypto_3.so || exit 1