mirror of
https://github.com/docker/compose.git
synced 2025-07-23 13:45:00 +02:00
Fix macOS build for Python 3.7
- Specify --with-openssl directory for Python build - Better checks for downloaded SDK, OpenSSL, and Python - Fix missing slash for Python build CPPFLAGS Signed-off-by: Christopher Crone <christopher.crone@docker.com>
This commit is contained in:
parent
bb0bd3b26b
commit
dbc229dc37
@ -50,7 +50,7 @@ mkdir -p ${TOOLCHAIN_PATH}
|
|||||||
#
|
#
|
||||||
# Set macOS SDK.
|
# Set macOS SDK.
|
||||||
#
|
#
|
||||||
if [ ${SDK_FETCH} ]; then
|
if [[ ${SDK_FETCH} && ! -f ${TOOLCHAIN_PATH}/MacOSX${DEPLOYMENT_TARGET}.sdk/SDKSettings.plist ]]; then
|
||||||
SDK_PATH=${TOOLCHAIN_PATH}/MacOSX${DEPLOYMENT_TARGET}.sdk
|
SDK_PATH=${TOOLCHAIN_PATH}/MacOSX${DEPLOYMENT_TARGET}.sdk
|
||||||
fetch_tarball ${SDK_URL} ${SDK_PATH} ${SDK_SHA1}
|
fetch_tarball ${SDK_URL} ${SDK_PATH} ${SDK_SHA1}
|
||||||
else
|
else
|
||||||
@ -61,7 +61,7 @@ fi
|
|||||||
# Build OpenSSL.
|
# Build OpenSSL.
|
||||||
#
|
#
|
||||||
OPENSSL_SRC_PATH=${TOOLCHAIN_PATH}/openssl-${OPENSSL_VERSION}
|
OPENSSL_SRC_PATH=${TOOLCHAIN_PATH}/openssl-${OPENSSL_VERSION}
|
||||||
if ! [ -f ${TOOLCHAIN_PATH}/bin/openssl ]; then
|
if ! [[ $(${TOOLCHAIN_PATH}/bin/openssl version) == *"${OPENSSL_VERSION}"* ]]; then
|
||||||
rm -rf ${OPENSSL_SRC_PATH}
|
rm -rf ${OPENSSL_SRC_PATH}
|
||||||
fetch_tarball ${OPENSSL_URL} ${OPENSSL_SRC_PATH} ${OPENSSL_SHA1}
|
fetch_tarball ${OPENSSL_URL} ${OPENSSL_SRC_PATH} ${OPENSSL_SHA1}
|
||||||
(
|
(
|
||||||
@ -77,7 +77,7 @@ fi
|
|||||||
# Build Python.
|
# Build Python.
|
||||||
#
|
#
|
||||||
PYTHON_SRC_PATH=${TOOLCHAIN_PATH}/Python-${PYTHON_VERSION}
|
PYTHON_SRC_PATH=${TOOLCHAIN_PATH}/Python-${PYTHON_VERSION}
|
||||||
if ! [ -f ${TOOLCHAIN_PATH}/bin/python3 ]; then
|
if ! [[ $(${TOOLCHAIN_PATH}/bin/python3 --version) == *"${PYTHON_VERSION}"* ]]; then
|
||||||
rm -rf ${PYTHON_SRC_PATH}
|
rm -rf ${PYTHON_SRC_PATH}
|
||||||
fetch_tarball ${PYTHON_URL} ${PYTHON_SRC_PATH} ${PYTHON_SHA1}
|
fetch_tarball ${PYTHON_URL} ${PYTHON_SRC_PATH} ${PYTHON_SHA1}
|
||||||
(
|
(
|
||||||
@ -87,9 +87,10 @@ if ! [ -f ${TOOLCHAIN_PATH}/bin/python3 ]; then
|
|||||||
--datarootdir=${TOOLCHAIN_PATH}/share \
|
--datarootdir=${TOOLCHAIN_PATH}/share \
|
||||||
--datadir=${TOOLCHAIN_PATH}/share \
|
--datadir=${TOOLCHAIN_PATH}/share \
|
||||||
--enable-framework=${TOOLCHAIN_PATH}/Frameworks \
|
--enable-framework=${TOOLCHAIN_PATH}/Frameworks \
|
||||||
|
--with-openssl=${TOOLCHAIN_PATH} \
|
||||||
MACOSX_DEPLOYMENT_TARGET=${DEPLOYMENT_TARGET} \
|
MACOSX_DEPLOYMENT_TARGET=${DEPLOYMENT_TARGET} \
|
||||||
CFLAGS="-isysroot ${SDK_PATH} -I${TOOLCHAIN_PATH}/include" \
|
CFLAGS="-isysroot ${SDK_PATH} -I${TOOLCHAIN_PATH}/include" \
|
||||||
CPPFLAGS="-I${SDK_PATH}/usr/include -I${TOOLCHAIN_PATH}include" \
|
CPPFLAGS="-I${SDK_PATH}/usr/include -I${TOOLCHAIN_PATH}/include" \
|
||||||
LDFLAGS="-isysroot ${SDK_PATH} -L ${TOOLCHAIN_PATH}/lib"
|
LDFLAGS="-isysroot ${SDK_PATH} -L ${TOOLCHAIN_PATH}/lib"
|
||||||
make -j 4
|
make -j 4
|
||||||
make install PYTHONAPPSDIR=${TOOLCHAIN_PATH}
|
make install PYTHONAPPSDIR=${TOOLCHAIN_PATH}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user