From c87c1ec1dad2c16c793092e1074ef841647ec316 Mon Sep 17 00:00:00 2001 From: Arto Kitula Date: Wed, 20 Sep 2017 00:04:23 +0300 Subject: deps build: bump Python to 3.6.2 and Numpy to 1.13.1 --- build_files/build_environment/cmake/numpy.cmake | 3 +- build_files/build_environment/cmake/versions.cmake | 14 ++++----- .../build_environment/patches/python_apple.diff | 33 ++++------------------ 3 files changed, 13 insertions(+), 37 deletions(-) (limited to 'build_files') diff --git a/build_files/build_environment/cmake/numpy.cmake b/build_files/build_environment/cmake/numpy.cmake index b1bf1691a28..874158fb5e9 100644 --- a/build_files/build_environment/cmake/numpy.cmake +++ b/build_files/build_environment/cmake/numpy.cmake @@ -45,10 +45,9 @@ ExternalProject_Add(external_numpy DOWNLOAD_DIR ${DOWNLOAD_DIR} URL_HASH MD5=${NUMPY_HASH} PREFIX ${BUILD_DIR}/numpy - PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/numpy/src/external_numpy < ${PATCH_DIR}/numpy.diff CONFIGURE_COMMAND "" LOG_BUILD 1 - BUILD_COMMAND ${PYTHON_BINARY} ${BUILD_DIR}/numpy/src/external_numpy/setup.py build ${NUMPY_BUILD_OPTION} install + BUILD_COMMAND ${PYTHON_BINARY} ${BUILD_DIR}/numpy/src/external_numpy/setup.py build ${NUMPY_BUILD_OPTION} install --old-and-unmanageable INSTALL_COMMAND ${NUMPY_INSTALL} ) diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index 5b5af6cfec1..77ae955d6a3 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -131,10 +131,10 @@ set(OSL_VERSION 1.7.5) set(OSL_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-${OSL_VERSION}.zip) set(OSL_HASH 6924dd5d453159e7b6eb106a08c358cf) -set(PYTHON_VERSION 3.5.3) -set(PYTHON_SHORT_VERSION 3.5) +set(PYTHON_VERSION 3.6.2) +set(PYTHON_SHORT_VERSION 3.6) set(PYTHON_URI https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz) -set(PYTHON_HASH 57d1f8bfbabf4f2500273fb0706e6f21) +set(PYTHON_HASH 2c68846471994897278364fc18730dd9) set(TBB_VERSION 44_20160128) set(TBB_URI https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb${TBB_VERSION}oss_src_0.tgz) @@ -148,10 +148,10 @@ set(REQUESTS_VERSION v2.10.0) set(REQUESTS_URI https://github.com/kennethreitz/requests/archive/${REQUESTS_VERSION}.zip) set(REQUESTS_HASH 6ebefdf0210c7f0933f61501334e46c3) -set(NUMPY_VERSION v1.10.1) -set(NUMPY_SHORT_VERSION 1.10) -set(NUMPY_URI https://pypi.python.org/packages/a5/2e/5412784108f5dc0f827fb460ccdeaa9d76286979fe5ddd070d526d168a59/numpy-1.10.1.zip) -set(NUMPY_HASH 6f57c58bc5b28440fbeccd505da63d58) +set(NUMPY_VERSION v1.13.1) +set(NUMPY_SHORT_VERSION 1.13) +set(NUMPY_URI https://pypi.python.org/packages/c0/3a/40967d9f5675fbb097ffec170f59c2ba19fc96373e73ad47c2cae9a30aed/numpy-1.13.1.zip) +set(NUMPY_HASH 2c3c0f4edf720c3a7b525dacc825b9ae) set(LAME_VERSION 3.99.5) set(LAME_URI http://downloads.sourceforge.net/project/lame/lame/3.99/lame-${LAME_VERSION}.tar.gz) diff --git a/build_files/build_environment/patches/python_apple.diff b/build_files/build_environment/patches/python_apple.diff index 0ca7a8d8f04..34a7906ed6c 100644 --- a/build_files/build_environment/patches/python_apple.diff +++ b/build_files/build_environment/patches/python_apple.diff @@ -1,28 +1,5 @@ ---- Modules/expat/expat_external.h 2016-12-17 06:51:30 -0500 -+++ Modules/expat/expat_external.h 2016-12-17 06:55:29 -0500 -@@ -7,9 +7,17 @@ - - /* External API definitions */ - --/* Namespace external symbols to allow multiple libexpat version to -- co-exist. */ --#include "pyexpatns.h" -+/* -+ -+ HACK: Fix build breakage on MacOS: -+ *** WARNING: renaming "pyexpat" since importing it failed: dlopen(build/lib.macosx-10.6-i386-3.3/pyexpat.so, 2): Symbol not found: _XML_ErrorString -+ This reverts c242a8f30806 from the python hg repo: -+ restore namespacing of pyexpat symbols (closes #19186) -+ See http://bugs.python.org/issue19186#msg214069 -+ The recommendation to include Modules/inc at first broke the Linux build... -+ So do it this way, as it was before. Needs some realignment later. -+ -+*/ - - #if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__) - #define XML_USE_MSC_EXTENSIONS 1 ---- pyconfig.h.in 2017-04-05 02:47:52.000000000 +0200 -+++ pyconfig.h.in 2017-04-05 02:51:33.000000000 +0200 +--- pyconfig.h.in 2017-09-19 14:41:01.000000000 +0300 ++++ pyconfig.h.in 2017-09-19 14:43:18.000000000 +0300 @@ -119,12 +119,6 @@ /* Define to 1 if you have the `clock' function. */ #undef HAVE_CLOCK @@ -33,10 +10,10 @@ -/* Define to 1 if you have the `clock_gettime' function. */ -#undef HAVE_CLOCK_GETTIME - - /* Define if the C compiler supports computed gotos. */ - #undef HAVE_COMPUTED_GOTOS + /* Define to 1 if you have the `clock_settime' function. */ + #undef HAVE_CLOCK_SETTIME -@@ -338,9 +332,6 @@ +@@ -369,9 +363,6 @@ /* Define this if you have flockfile(), getc_unlocked(), and funlockfile() */ #undef HAVE_GETC_UNLOCKED -- cgit v1.2.3 From 46300a541db761a64a59b5f1acdc057a8acb11d6 Mon Sep 17 00:00:00 2001 From: Arto Kitula Date: Wed, 20 Sep 2017 00:07:56 +0300 Subject: macOS: use python version 3.6 when building blender --- build_files/cmake/platform/platform_apple.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build_files') diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index 00c5772e11c..b4e99865af0 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -88,7 +88,7 @@ endif() if(WITH_PYTHON) # we use precompiled libraries for py 3.5 and up by default - set(PYTHON_VERSION 3.5) + set(PYTHON_VERSION 3.6) if(NOT WITH_PYTHON_MODULE AND NOT WITH_PYTHON_FRAMEWORK) # normally cached but not since we include them with blender set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m") -- cgit v1.2.3 From 77dccbf4811e454a37621464abddd15ec10032b5 Mon Sep 17 00:00:00 2001 From: Arto Kitula Date: Wed, 20 Sep 2017 00:08:32 +0300 Subject: deps build: fix sndfile building on macOS --- build_files/build_environment/cmake/sndfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build_files') diff --git a/build_files/build_environment/cmake/sndfile.cmake b/build_files/build_environment/cmake/sndfile.cmake index 38ba3043c98..d54a71dd7ce 100644 --- a/build_files/build_environment/cmake/sndfile.cmake +++ b/build_files/build_environment/cmake/sndfile.cmake @@ -32,7 +32,7 @@ ExternalProject_Add(external_sndfile DOWNLOAD_DIR ${DOWNLOAD_DIR} URL_HASH MD5=${SNDFILE_HASH} PREFIX ${BUILD_DIR}/sndfile - CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && ${SNDFILE_ENV} ${CONFIGURE_COMMAND} ${SNDFILE_OPTIONS} --prefix=${mingw_LIBDIR}/sndfile + CONFIGURE_COMMAND cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && ${SNDFILE_ENV} ${CONFIGURE_COMMAND} ${SNDFILE_OPTIONS} --prefix=${mingw_LIBDIR}/sndfile BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && make -j${MAKE_THREADS} INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && make install INSTALL_DIR ${LIBDIR}/sndfile -- cgit v1.2.3