Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2018-09-17 20:58:13 +0300
committerRay Molenkamp <github@lazydodo.com>2018-09-17 20:58:13 +0300
commit9e4f44ad30ec97b2179865131a492f8daae26ed0 (patch)
tree9b579a18810bfb1cabbe7fb15a2b08f70892b96f /build_files/build_environment/cmake/ffi.cmake
parent39c18c54136323fbf56e667fdb1f1345c7d0f89b (diff)
build_environment: ffi/linux force predictable lib path.
ffi stubbornly wants to put libs in lib64 even when you tell it not to on some linux distributions. patch based on sed fix the gentoo guys did [1] [1] https://bugs.gentoo.org/462814
Diffstat (limited to 'build_files/build_environment/cmake/ffi.cmake')
-rw-r--r--build_files/build_environment/cmake/ffi.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/build_files/build_environment/cmake/ffi.cmake b/build_files/build_environment/cmake/ffi.cmake
index 18531fd7906..bc0932022cb 100644
--- a/build_files/build_environment/cmake/ffi.cmake
+++ b/build_files/build_environment/cmake/ffi.cmake
@@ -25,8 +25,10 @@ ExternalProject_Add(external_ffi
--enable-shared=no
--enable-static=yes
--with-pic
+ --libdir=${LIBDIR}/ffi/lib/
BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ffi/src/external_ffi/ && make -j${MAKE_THREADS}
INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ffi/src/external_ffi/ && make install
+ PATCH_COMMAND ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/ffi/src/external_ffi < ${PATCH_DIR}/ffi.diff
INSTALL_DIR ${LIBDIR}/ffi
)