Skip to content

Commit 485e884

Browse files
authored
Update OpenSSL 1.1.1t (#525)
IB-7656 Signed-off-by: Raul Metsma <[email protected]>
1 parent b403657 commit 485e884

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

build-library.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -e
55
if [ "$#" -eq 0 ]; then
66
echo "Usage:"
77
echo " $0 target [maketask]"
8-
echo " target: osx ios iossimulator androidarm androidarm64 androidx86 androidx86_64"
8+
echo " target: osx ios iossimulator ioscatalyst androidarm androidarm64 androidx86 androidx86_64"
99
echo "To control iOS, macOS builds set environment variables:"
1010
echo " minimum deployment target"
1111
echo " - MACOSX_DEPLOYMENT_TARGET=10.15"

prepare_osx_build_environment.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ XERCES_DIR=xerces-c-3.2.4
55
XALAN_DIR=xalan_c-1.12
66
XMLSEC_DIR=xml-security-c-2.0.4
77
XSD=xsd-4.0.0-i686-macosx
8-
OPENSSL_DIR=openssl-1.1.1s
8+
OPENSSL_DIR=openssl-1.1.1t
99
LIBXML2_DIR=libxml2-2.10.3
1010
ANDROID_NDK=android-ndk-r25
1111
FREETYPE_DIR=freetype-2.10.1
@@ -73,7 +73,7 @@ case "$@" in
7373
*ioscatalyst*)
7474
echo "Building for iOS macOS Catalyst"
7575
TARGET_PATH=/Library/libdigidocpp.iphonecatalyst
76-
CONFIGURE="--host=x86_64-apple-darwin --enable-static --disable-shared --disable-dependency-tracking --disable-netaccessor-curl"
76+
CONFIGURE="--host=x86_64-apple-darwin --enable-static --disable-shared --disable-dependency-tracking"
7777
SYSROOT=$(xcrun -sdk macosx --show-sdk-path)
7878
: ${ARCHS:="x86_64 arm64"}
7979
: ${IPHONEOS_DEPLOYMENT_TARGET:="12.0"}
@@ -112,7 +112,7 @@ function xerces {
112112
tar xf ${XERCES_DIR}.tar.xz
113113
cd ${XERCES_DIR}
114114
sed -ie 's!SUBDIRS = doc src tests samples!SUBDIRS = src!' Makefile.in
115-
./configure --prefix=${TARGET_PATH} ${CONFIGURE} --enable-transcoder-iconv
115+
./configure --prefix=${TARGET_PATH} ${CONFIGURE} --enable-transcoder-iconv --disable-netaccessor-curl
116116
make -s
117117
sudo make install
118118
cd -
@@ -420,7 +420,7 @@ case "$@" in
420420
*)
421421
echo "Usage:"
422422
echo " $0 [target] [task]"
423-
echo " target: osx ios iossimulator androidarm androidarm64 androidx86 androidx86_64"
423+
echo " target: osx ios iossimulator ioscatalyst androidarm androidarm64 androidx86 androidx86_64"
424424
echo " tasks: xerces, xalan, openssl, xmlsec, xsd, all, help"
425425
echo "To control iOS, macOS builds set environment variables:"
426426
echo " minimum deployment target"

0 commit comments

Comments
 (0)