This repository was archived by the owner on Jan 6, 2025. It is now read-only.
File tree 2 files changed +5
-2
lines changed
2 files changed +5
-2
lines changed Original file line number Diff line number Diff line change @@ -56,6 +56,9 @@ if [[ ${RECONF_nettle} -eq 1 ]]; then
56
56
autoreconf_library ${LIB_NAME}
57
57
fi
58
58
59
+ ${SED_INLINE} ' s/exit(0)/return 0/g' ${BASEDIR} /src/${LIB_NAME} /configure
60
+ ${SED_INLINE} ' s/exit (0)/return 0/g' ${BASEDIR} /src/${LIB_NAME} /configure
61
+
59
62
./configure \
60
63
--prefix=${BASEDIR} /prebuilt/$( get_target_build_directory) /${LIB_NAME} \
61
64
--enable-pic \
Original file line number Diff line number Diff line change @@ -986,7 +986,7 @@ if [[ -n ${MOBILE_FFMPEG_LTS_BUILD} ]] && [[ "${DETECTED_IOS_SDK_VERSION}" != "$
986
986
fi
987
987
988
988
# DISABLE 32-bit architectures on newer IOS versions
989
- if [[ ${DETECTED_IOS_SDK_VERSION} == 11* ]] || [[ ${DETECTED_IOS_SDK_VERSION} == 12* ]] || [[ ${DETECTED_IOS_SDK_VERSION} == 13* ]]; then
989
+ if [[ ${DETECTED_IOS_SDK_VERSION} == 11* ]] || [[ ${DETECTED_IOS_SDK_VERSION} == 12* ]] || [[ ${DETECTED_IOS_SDK_VERSION} == 13* ]] || [[ ${DETECTED_IOS_SDK_VERSION} == 14 * ]] ; then
990
990
if [[ -z ${BUILD_FORCE} ]] && [[ ${ENABLED_ARCHITECTURES[${ARCH_ARMV7}]} -eq 1 ]]; then
991
991
echo -e " INFO: Disabled armv7 architecture which is not supported on SDK ${DETECTED_IOS_SDK_VERSION} \n" 1>> " ${BASEDIR} /build.log" 2>&1
992
992
disable_arch " armv7"
@@ -1009,7 +1009,7 @@ elif [[ ${DETECTED_IOS_SDK_VERSION} != 10* ]]; then
1009
1009
fi
1010
1010
1011
1011
# DISABLE x86-64-mac-catalyst architecture on IOS versions lower than 13
1012
- if [[ ${DETECTED_IOS_SDK_VERSION} != 13* ]] && [[ -z ${BUILD_FORCE} ]] && [[ ${ENABLED_ARCHITECTURES[${ARCH_X86_64_MAC_CATALYST}]} -eq 1 ]]; then
1012
+ if [[ ${DETECTED_IOS_SDK_VERSION} != 13* || ${DETECTED_IOS_SDK_VERSION} != 14 * ]] && [[ -z ${BUILD_FORCE} ]] && [[ ${ENABLED_ARCHITECTURES[${ARCH_X86_64_MAC_CATALYST}]} -eq 1 ]]; then
1013
1013
echo -e " INFO: Disabled x86-64-mac-catalyst architecture which is not supported on SDK ${DETECTED_IOS_SDK_VERSION} \n" 1>> " ${BASEDIR} /build.log" 2>&1
1014
1014
disable_arch " x86-64-mac-catalyst"
1015
1015
fi
You can’t perform that action at this time.
0 commit comments