[Bf-blender-cvs] [d2161d6463d] master: build_environment: linux/python, help python find ffi.

Ray Molenkamp noreply at git.blender.org
Mon Sep 17 21:13:30 CEST 2018


Commit: d2161d6463df405b8b9ee882a5a23b6ebeb46427
Author: Ray Molenkamp
Date:   Mon Sep 17 13:13:17 2018 -0600
Branches: master
https://developer.blender.org/rBd2161d6463df405b8b9ee882a5a23b6ebeb46427

build_environment: linux/python, help python find ffi.

we were building ffi, but python wasn't finding it.

===================================================================

M	build_files/build_environment/cmake/python.cmake

===================================================================

diff --git a/build_files/build_environment/cmake/python.cmake b/build_files/build_environment/cmake/python.cmake
index c61a0084b6f..ccef8a825b7 100644
--- a/build_files/build_environment/cmake/python.cmake
+++ b/build_files/build_environment/cmake/python.cmake
@@ -89,11 +89,12 @@ else()
 
 	set(PYTHON_CONFIGURE_EXTRA_ARGS "--with-openssl=${LIBDIR}/ssl")
 	set(PYTHON_CFLAGS "-I${LIBDIR}/sqlite/include -I${LIBDIR}/bzip2/include -I${LIBDIR}/lzma/include -I${LIBDIR}/zlib/include")
-	set(PYTHON_LDFLAGS "-L${LIBDIR}/sqlite/lib -L${LIBDIR}/bzip2/lib -L${LIBDIR}/lzma/lib -L${LIBDIR}/zlib/lib")
+	set(PYTHON_LDFLAGS "-L${LIBDIR}/ffi/lib -L${LIBDIR}/sqlite/lib -L${LIBDIR}/bzip2/lib -L${LIBDIR}/lzma/lib -L${LIBDIR}/zlib/lib")
 	set(PYTHON_CONFIGURE_EXTRA_ENV
 		export CFLAGS=${PYTHON_CFLAGS} &&
 		export CPPFLAGS=${PYTHON_CFLAGS} &&
-		export LDFLAGS=${PYTHON_LDFLAGS})
+		export LDFLAGS=${PYTHON_LDFLAGS} &&
+		export PKG_CONFIG_PATH=${LIBDIR}/ffi/lib/pkgconfig)
 	set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_linux.diff)
 
 	ExternalProject_Add(external_python



More information about the Bf-blender-cvs mailing list