Skip to content
Permalink
Browse files

fixes for macos catalina

  • Loading branch information
aothms committed Nov 22, 2019
1 parent bfaa9ed commit 9bcd932bed48486bf5b5f48d24b49329c280462f
Showing with 15 additions and 8 deletions.
  1. +15 −8 nix/build-all.py
@@ -92,7 +92,7 @@
PCRE_VERSION="8.41"
#LIBXML2_VERSION="2.9.3"
LIBXML2_VERSION="2.9.9"
CMAKE_VERSION="3.4.1"
CMAKE_VERSION="3.4.3"
#CMAKE_VERSION="3.14.5"
SWIG_VERSION="3.0.12"
#SWIG_VERSION="4.0.0"
@@ -598,6 +598,7 @@ def build_dependency(name, mode, build_tool_args, download_url, download_name, d
download_url="https://github.com/KhronosGroup/OpenCOLLADA.git",
download_name="OpenCOLLADA",
download_tool=download_tool_git,
patch="./patches/opencollada/pr622.patch",
revision=OPENCOLLADA_VERSION
)

@@ -625,13 +626,19 @@ def PYTHON_VERSION_CONFS():
yield v, unicode_conf, abi_tag

for PYTHON_VERSION, unicode_conf, abi_tag in PYTHON_VERSION_CONFS():
build_dependency(
"python-{PYTHON_VERSION}{abi_tag}".format(**locals()),
"autoconf",
PYTHON_CONFIGURE_ARGS + [unicode_conf],
"http://www.python.org/ftp/python/{PYTHON_VERSION}/".format(**locals()),
"Python-{PYTHON_VERSION}.tgz".format(**locals())
)
try:
build_dependency(
"python-{PYTHON_VERSION}{abi_tag}".format(**locals()),
"autoconf",
PYTHON_CONFIGURE_ARGS + [unicode_conf],
"http://www.python.org/ftp/python/{PYTHON_VERSION}/".format(**locals()),
"Python-{PYTHON_VERSION}.tgz".format(**locals())
)
except Exception as e:
pyver2 = PYTHON_VERSION[:PYTHON_VERSION.rfind('.')]
if os.path.exists("{DEPS_DIR}/install/python-{PYTHON_VERSION}{abi_tag}/bin/python{pyver2}".format(**locals())):
print("Installation partially failed")
else: raise e

os.environ["CXXFLAGS"]=OLD_CXX_FLAGS
os.environ["CFLAGS"]=OLD_C_FLAGS

1 comment on commit 9bcd932

@IfcOpenBot

This comment has been minimized.

Copy link
Owner

IfcOpenBot commented on 9bcd932 Nov 25, 2019

Hi,

I've created the following builds for your commit:

Linux Win macOS
Blender py37 32bit / 64bit 32bit / 64bit 64bit
IfcConvert 32bit / 64bit 32bit / 64bit 64bit
IfcGeomServer 32bit / 64bit 32bit / 64bit 64bit
Python 27 32bit / 64bit 32bit / 64bit 64bit
Python 27u 32bit / 64bit 64bit
Python 32 32bit / 64bit 32bit / 64bit 64bit
Python 32u 32bit / 64bit 64bit
Python 33 32bit / 64bit 32bit / 64bit 64bit
Python 34 32bit / 64bit 32bit / 64bit 64bit
Python 35 32bit / 64bit 32bit / 64bit 64bit
Python 36 32bit / 64bit 32bit / 64bit 64bit
Python 37 32bit / 64bit 32bit / 64bit 64bit

Kind regards,
IfcOpenBot

Please sign in to comment.
You can’t perform that action at this time.