commit: a8ad5900db1f02b75ce25108ea867806abf07095 Author: Craig Andrews <candrews <AT> gentoo <DOT> org> AuthorDate: Wed Nov 18 17:53:45 2020 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Wed Nov 18 17:56:01 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8ad5900
sys-devel/llvm-roc: Fix compile when tensorflow is installed Closes: https://bugs.gentoo.org/754276 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> .../llvm-roc/files/llvm-roc-3.9.0-tensorflow.patch | 35 ++++++++++++++++++++++ sys-devel/llvm-roc/llvm-roc-3.9.0.ebuild | 1 + 2 files changed, 36 insertions(+) diff --git a/sys-devel/llvm-roc/files/llvm-roc-3.9.0-tensorflow.patch b/sys-devel/llvm-roc/files/llvm-roc-3.9.0-tensorflow.patch new file mode 100644 index 00000000000..3e1124457ad --- /dev/null +++ b/sys-devel/llvm-roc/files/llvm-roc-3.9.0-tensorflow.patch @@ -0,0 +1,35 @@ +--- llvm-project-rocm-3.9.0.orig/CMakeLists.txt 2020-11-12 22:03:09.902293395 +0100 ++++ llvm-project-rocm-3.9.0/CMakeLists.txt 2020-11-12 22:07:28.185294853 +0100 +@@ -824,6 +824,11 @@ + ${LLVM_INCLUDE_DIR}/llvm/Config/Targets.def + ) + ++# They are not referenced. See set_output_directory(). ++set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/bin ) ++set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} ) ++set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} ) ++ + # For up-to-date instructions for installing the Tensorflow dependency, refer to + # the bot setup script: https://github.com/google/ml-compiler-opt/blob/master/buildbot/buildbot_init.sh + # In this case, the latest C API library is available for download from +@@ -832,18 +837,13 @@ + # LLVM_HAVE_TF_API, through llvm-config.h, so that a user of the LLVM library may + # also leverage the dependency. + set(TENSORFLOW_C_LIB_PATH "" CACHE PATH "Path to TensorFlow C library install") +-find_library(tensorflow_c_api tensorflow PATHS ${TENSORFLOW_C_LIB_PATH}/lib) + +-if (tensorflow_c_api) ++if (TENSORFLOW_C_LIB_PATH) ++ find_library(tensorflow_c_api tensorflow PATHS ${TENSORFLOW_C_LIB_PATH}/lib NO_DEFAULT_PATH REQUIRED) + set(LLVM_HAVE_TF_API "ON" CACHE BOOL "Full Tensorflow API available") + include_directories(${TENSORFLOW_C_LIB_PATH}/include) + endif() + +-# They are not referenced. See set_output_directory(). +-set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/bin ) +-set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} ) +-set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} ) +- + # For up-to-date instructions for installing the Tensorflow dependency, refer to + # the bot setup script: https://github.com/google/ml-compiler-opt/blob/master/buildbot/buildbot_init.sh + # Specifically, assuming python3 is installed: diff --git a/sys-devel/llvm-roc/llvm-roc-3.9.0.ebuild b/sys-devel/llvm-roc/llvm-roc-3.9.0.ebuild index 8bcc3f8ce0e..bc0fdfcde77 100644 --- a/sys-devel/llvm-roc/llvm-roc-3.9.0.ebuild +++ b/sys-devel/llvm-roc/llvm-roc-3.9.0.ebuild @@ -25,6 +25,7 @@ S="${WORKDIR}/llvm-project-rocm-${PV}/llvm" PATCHES=( "${FILESDIR}/${PN}-3.7.0-current_pos.patch" + "${FILESDIR}/${P}-tensorflow.patch" ) CMAKE_BUILD_TYPE=RelWithDebInfo
