diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-08-06 20:10:31 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-08-06 20:10:31 +0100 |
| commit | 944b3df0f275eea0fd7808913d72a0b280df0c33 (patch) | |
| tree | ec33697fafd5ce7028b7619baef7a6d27bb74362 /dev-util/rocm-clang-ocl | |
| parent | 7e17b5aabc330abb894f2b90bef0e3fcbcd180d2 (diff) | |
gentoo auto-resync : 06:08:2022 - 20:10:30
Diffstat (limited to 'dev-util/rocm-clang-ocl')
| -rw-r--r-- | dev-util/rocm-clang-ocl/Manifest | 3 | ||||
| -rw-r--r-- | dev-util/rocm-clang-ocl/files/rocm-clang-ocl-5.0.2-system-llvm.patch | 17 | ||||
| -rw-r--r-- | dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2-r1.ebuild (renamed from dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2.ebuild) | 9 |
3 files changed, 24 insertions, 5 deletions
diff --git a/dev-util/rocm-clang-ocl/Manifest b/dev-util/rocm-clang-ocl/Manifest index 4baa8bee5352..9c0f6da8c531 100644 --- a/dev-util/rocm-clang-ocl/Manifest +++ b/dev-util/rocm-clang-ocl/Manifest @@ -1,5 +1,6 @@ +AUX rocm-clang-ocl-5.0.2-system-llvm.patch 715 BLAKE2B 7a23c5887e3251b68113f5466946a4a967808ec4268df2eac093b374497cce8d1ca4955c549cc8c2c5f676a51903be367fc457b01a8d1d2f3bfdf5aa85dad024 SHA512 a45561970797cf8f7406ae9ff0e3844cfd8641a5b9ee08a2958907a0154f2cafe3142c507e5249df3bfb3108f17032edeceeab850143eee358886e4ff6ade035 DIST rocm-clang-ocl-4.3.0.tar.gz 3241 BLAKE2B 1a646d64e42a8884a7714b4ca25d888aa1e84d68be3f6ceacefcf7836340133740c8df85f152fadb40d463af76eb659f0fd11ebd2b0a6a3c0da3b7ac64bf541c SHA512 059d0d118205d6f4c2a61222fc74709a86bbe71687615debcc1698f73c28a769379b909cd18742b4d3340ba30a65b02da9224fbe5fe0e2fb005d9a45f22dfe9c DIST rocm-clang-ocl-5.0.2.tar.gz 3908 BLAKE2B b348c047d2dcea9524847cbb44d37e56c16fa05d5ab7f1b798e22c1f3d61b38aa725436f3ef44491898f4afd675716036efaf3959cac310b2905a2d16fc6e911 SHA512 582b9ff425c1f9ff4fb32cf7b64c8357f8f585ab75b31b63cfa8705725f823cd0cc60f0d0a641f66c6760d8a5378444f29f3f57b8989d36f4fd32bb7b397d167 EBUILD rocm-clang-ocl-4.3.0.ebuild 912 BLAKE2B 0c5a8985f4eb050a2faa5b136523383ae03addf1d6b38508ff67c118436398c74e90488c20292832a87d1b0099a1ef9e0d8bfff65e21036a88e5f7f17e898779 SHA512 4b6410884e506cbf847ee57581cd820bd4fbb9158c4c74281ef3c4bd4cf07f34e50d20abe724e1dc2b39c8c0e88de673943207f8a741e4df0608c8ec5d8f0d58 -EBUILD rocm-clang-ocl-5.0.2.ebuild 912 BLAKE2B 5f546699f86c7d5c5180ac1e72631bc75be828c61aa60546e7b4163f7100bef0d5747f887fec47dbadfa53cd97927fae378f3cc8dd2e76a22284569ca9182b6e SHA512 6ecd1861b6fe80d23b5d20ca4149da833ee795888d2adef13004ccf3f59b4570717b23266a1866aacbb9c963e751194c7e6f599b23d743b814eeb44d73e1e103 +EBUILD rocm-clang-ocl-5.0.2-r1.ebuild 850 BLAKE2B b3f6c078612c7849bc5a83ccc367d834d820c2a194e45ec2851c66a711e7b042becf0c67e41b31091f84b7ecc0930faac8d65ca49811127f66b3f98629654afa SHA512 4733c5a49318fc27dba5aa5c63283b1140d937201897c97017e0333a19383209ff5d60c498121ee3eedb75b2354291aa5b8619b2c5ef05d7eb14fa78a2291db1 MISC metadata.xml 453 BLAKE2B 4c1e76cbc277e93a92a95cda405973cc72863882ab9a6729a07976e7815119e985688387c14fc5017fd6e85aaa64eaa72b900375c7f7428eb6bbb2569c5ecaa6 SHA512 0e42066a5ac8720d1b561bcf23269013d9cceff52a9ddd6a6e0af58c7d2628c335bb290e0dc6c262a0542e286f54fd07cb487dd908343fac5cfca07410df6e56 diff --git a/dev-util/rocm-clang-ocl/files/rocm-clang-ocl-5.0.2-system-llvm.patch b/dev-util/rocm-clang-ocl/files/rocm-clang-ocl-5.0.2-system-llvm.patch new file mode 100644 index 000000000000..5f052f4282e0 --- /dev/null +++ b/dev-util/rocm-clang-ocl/files/rocm-clang-ocl-5.0.2-system-llvm.patch @@ -0,0 +1,17 @@ +Use system clang. + +Forwarded: not yet. + +Index: clang-ocl-rocm-5.0.2/CMakeLists.txt +=================================================================== +--- clang-ocl-rocm-5.0.2.orig/CMakeLists.txt ++++ clang-ocl-rocm-5.0.2/CMakeLists.txt +@@ -20,7 +20,7 @@ if(hcc_FOUND) + set(CLANG_BIN "${hcc_LIB_INSTALL_DIR}/../bin" CACHE STRING "") + set(BITCODE_DIR "${hcc_LIB_INSTALL_DIR}" CACHE STRING "") + else() +- find_program(CLANG_EXE NAMES clang HINTS ${CXX_COMPILER_PATH}/bin PATHS /opt/rocm/llvm/bin) ++ find_program(CLANG_EXE NAMES clang) + get_filename_component(CLANG_EXE_DIR ${CLANG_EXE} DIRECTORY) + find_package(AMDDeviceLibs PATHS /opt/rocm) + set(CLANG_BIN "${CLANG_EXE_DIR}" CACHE STRING "") diff --git a/dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2.ebuild b/dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2-r1.ebuild index 202836d1adbe..40be9d9dd7df 100644 --- a/dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2.ebuild +++ b/dev-util/rocm-clang-ocl/rocm-clang-ocl-5.0.2-r1.ebuild @@ -20,12 +20,13 @@ DEPEND=" S="${WORKDIR}/clang-ocl-rocm-${PV}" +PATCHES=( "${FILESDIR}"/${PN}-5.0.2-system-llvm.patch ) + src_prepare() { - sed -e "s:HINTS \${CXX_COMPILER_PATH}/bin:NO_DEFAULT_PATH:" \ - -e "s:/opt/rocm/llvm/bin:${EPREFIX}/usr/lib/llvm/roc/bin:" \ + cmake_src_prepare + + sed \ -e "/AMDDeviceLibs PATHS/s:/opt/rocm:${EPREFIX}/usr/lib/cmake/AMDDeviceLibs:" \ -e "s:\${AMD_DEVICE_LIBS_PREFIX}/amdgcn/bitcode:${EPREFIX}/usr/lib/amdgcn/bitcode:" \ -i CMakeLists.txt || die - - cmake_src_prepare } |