From 2aa83032365b30768ff7c137e45e4e0cba33a302 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 12 Oct 2021 12:21:31 +0300 Subject: Provisioning: Add OpenSSL for Android to macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-97243 Pick-to: 6.2 Change-Id: Ibf67b7d713904edb9f8ee83b35eb096e2d3f1eb1 Reviewed-by: Tor Arne Vestbø --- .../common/linux/openssl_for_android_linux.sh | 83 ------------------- .../common/unix/openssl_for_android.sh | 92 ++++++++++++++++++++++ .../50-openssl_for_android_linux.sh | 6 +- .../50-openssl_for_android_linux.sh | 6 +- .../50-openssl_for_android_linux.sh | 6 +- .../50-openssl_for_android_linux.sh | 6 +- .../50-openssl_for_android_linux.sh | 6 +- .../50-openssl_for_android_darwin.sh | 38 +++++++++ 8 files changed, 145 insertions(+), 98 deletions(-) delete mode 100755 coin/provisioning/common/linux/openssl_for_android_linux.sh create mode 100755 coin/provisioning/common/unix/openssl_for_android.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/50-openssl_for_android_darwin.sh diff --git a/coin/provisioning/common/linux/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh deleted file mode 100755 index 13424c6f..00000000 --- a/coin/provisioning/common/linux/openssl_for_android_linux.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2021 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# This script install prebuilt OpenSSL which was built against Android NDK 21. -# OpenSSL build will fail with Android NDK 22, because it's missing platforms and sysroot directories - -set -ex -# shellcheck source=../unix/DownloadURL.sh -source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" -# shellcheck source=../unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" - -version="1.1.1k" -: ' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK 21 -# Source built requires GCC and Perl to be in PATH. -exports_file="/tmp/export.sh" -# source previously made environmental variables. -if uname -a |grep -q "Ubuntu"; then - # shellcheck disable=SC1090 - grep -e "^export" "$HOME/.profile" > $exports_file && source $exports_file - rm -rf "$exports_file" -else - # shellcheck disable=SC1090 - grep -e "^export" "$HOME/.bashrc" > $exports_file && source $exports_file - rm -rf "$exports_file" -fi - -officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" -cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz" -targetFile="/tmp/openssl-$version.tar.gz" -sha="bad9dc4ae6dcc1855085463099b5dacb0ec6130b" -opensslHome="${HOME}/openssl/android/openssl-${version}" -DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" -mkdir -p "${HOME}/openssl/android/" -tar -xzf "$targetFile" -C "${HOME}/openssl/android/" - -TOOLCHAIN=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin -cd "$opensslHome" -PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm -PATH=$TOOLCHAIN:$PATH CC=clang make build_generated -' -prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_k_for-android-ndk-21.tar.gz" -targetFile="/tmp/prebuilt-openssl-$version.tar.gz" -sha="8c4db1eb8460d749c998a0e033b3939123cbc5ac" -DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile" -tar -xzf "$targetFile" -C "${HOME}" - -opensslHome="${HOME}/openssl/android/openssl-${version}" -SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome" - -echo "OpenSSL for Android = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/unix/openssl_for_android.sh b/coin/provisioning/common/unix/openssl_for_android.sh new file mode 100755 index 00000000..2b4057d2 --- /dev/null +++ b/coin/provisioning/common/unix/openssl_for_android.sh @@ -0,0 +1,92 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2021 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script install prebuilt OpenSSL which was built against Android NDK 21. +# OpenSSL build will fail with Android NDK 22, because it's missing platforms and sysroot directories + +set -ex +# shellcheck source=../unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + +version="1.1.1k" +: ' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK 21 +# Source built requires GCC and Perl to be in PATH. +exports_file="/tmp/export.sh" +# source previously made environmental variables. +if uname -a |grep -q "Ubuntu"; then + # shellcheck disable=SC1090 + grep -e "^export" "$HOME/.profile" > $exports_file && source $exports_file + rm -rf "$exports_file" +else + # shellcheck disable=SC1090 + grep -e "^export" "$HOME/.bashrc" > $exports_file && source $exports_file + rm -rf "$exports_file" +fi + +officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" +cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz" +targetFile="/tmp/openssl-$version.tar.gz" +sha="bad9dc4ae6dcc1855085463099b5dacb0ec6130b" +opensslHome="${HOME}/openssl/android/openssl-${version}" +DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" +mkdir -p "${HOME}/openssl/android/" +tar -xzf "$targetFile" -C "${HOME}/openssl/android/" +if uname -a |grep -q "Darwin"; then + TOOLCHAIN=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/darwin-x86_64/bin +else + TOOLCHAIN=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin +fi +cd "$opensslHome" +PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm +PATH=$TOOLCHAIN:$PATH CC=clang make build_generated +' + +if uname -a |grep -q "Darwin"; then + prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_k_for-android-ndk-21_darwin.tar.gz" + sha="6e3e48441ff58596f25bc27fdc05ae43e5a7581d" +else + prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_k_for-android-ndk-21.tar.gz" + sha="8c4db1eb8460d749c998a0e033b3939123cbc5ac" +fi +targetFile="/tmp/prebuilt-openssl-$version.tar.gz" +DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile" +tar -xzf "$targetFile" -C "${HOME}" + +opensslHome="${HOME}/openssl/android/openssl-${version}" +SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome" + +echo "OpenSSL for Android = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/50-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/50-openssl_for_android_linux.sh index 6666ea15..c4b8601a 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/50-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/50-openssl_for_android_linux.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -34,5 +34,5 @@ ############################################################################# set -ex -# shellcheck source=../common/linux/openssl_for_android_linux.sh -source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh" +# shellcheck source=../common/unix/openssl_for_android.sh +source "${BASH_SOURCE%/*}/../common/unix/openssl_for_android.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/50-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/50-openssl_for_android_linux.sh index 6666ea15..c4b8601a 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/50-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/50-openssl_for_android_linux.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -34,5 +34,5 @@ ############################################################################# set -ex -# shellcheck source=../common/linux/openssl_for_android_linux.sh -source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh" +# shellcheck source=../common/unix/openssl_for_android.sh +source "${BASH_SOURCE%/*}/../common/unix/openssl_for_android.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/50-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/50-openssl_for_android_linux.sh index 6666ea15..c4b8601a 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/50-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/50-openssl_for_android_linux.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -34,5 +34,5 @@ ############################################################################# set -ex -# shellcheck source=../common/linux/openssl_for_android_linux.sh -source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh" +# shellcheck source=../common/unix/openssl_for_android.sh +source "${BASH_SOURCE%/*}/../common/unix/openssl_for_android.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/50-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/50-openssl_for_android_linux.sh index 81ea3b17..9080f38a 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/50-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/50-openssl_for_android_linux.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -35,5 +35,5 @@ set -ex -# shellcheck source=../common/linux/openssl_for_android_linux.sh -source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh" +# shellcheck source=../common/unix/openssl_for_android_linux.sh +source "${BASH_SOURCE%/*}/../common/unix/openssl_for_android_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/50-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/50-openssl_for_android_linux.sh index 81ea3b17..353b2523 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/50-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/50-openssl_for_android_linux.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -35,5 +35,5 @@ set -ex -# shellcheck source=../common/linux/openssl_for_android_linux.sh -source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh" +# shellcheck source=../common/unix/openssl_for_android.sh +source "${BASH_SOURCE%/*}/../common/unix/openssl_for_android.sh" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/50-openssl_for_android_darwin.sh b/coin/provisioning/qtci-macos-10.14-x86_64/50-openssl_for_android_darwin.sh new file mode 100755 index 00000000..c4b8601a --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/50-openssl_for_android_darwin.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2021 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# +set -ex + +# shellcheck source=../common/unix/openssl_for_android.sh +source "${BASH_SOURCE%/*}/../common/unix/openssl_for_android.sh" -- cgit v1.2.3