atmi: replace /usr/bin/rsync with depends_on rsync (#26353)

This commit is contained in:
Sreenivasa Murthy Kolam 2021-10-02 15:32:46 -07:00 committed by GitHub
parent 8dcd568769
commit f1c83b00d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 71 additions and 0 deletions

View file

@ -0,0 +1,68 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ab4533a..9249de2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -64,7 +64,7 @@ add_subdirectory(device_runtime)
# make examples available in local build
add_custom_command(
OUTPUT examples
- COMMAND /usr/bin/rsync -rl ${CMAKE_CURRENT_SOURCE_DIR}/../examples .
+ COMMAND rsync -rl ${CMAKE_CURRENT_SOURCE_DIR}/../examples .
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../examples/*
)
add_custom_target(example ALL DEPENDS examples)
@@ -72,7 +72,7 @@ add_custom_target(example ALL DEPENDS examples)
# make bin available in local build
add_custom_command(
OUTPUT bin
- COMMAND /usr/bin/rsync -rl ${CMAKE_CURRENT_SOURCE_DIR}/../bin .
+ COMMAND rsync -rl ${CMAKE_CURRENT_SOURCE_DIR}/../bin .
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../bin/*
)
add_custom_target(script ALL DEPENDS bin)
diff --git a/src/device_runtime/CMakeLists.txt b/src/device_runtime/CMakeLists.txt
index 20e15a8..333cb47 100644
--- a/src/device_runtime/CMakeLists.txt
+++ b/src/device_runtime/CMakeLists.txt
@@ -108,7 +108,7 @@ set (OUTPUT_INC_DIRECTORY ${ATMI_RUNTIME_PATH}/include)
execute_process(COMMAND "/bin/mkdir" "-p" "${OUTPUT_INC_DIRECTORY}")
add_custom_command(
OUTPUT ${OUTPUT_INC_DIRECTORY}/atmi_kl.h
- COMMAND /usr/bin/rsync ${CMAKE_CURRENT_SOURCE_DIR}/../../include/atmi_kl.h ${OUTPUT_INC_DIRECTORY}/atmi_kl.h
+ COMMAND rsync ${CMAKE_CURRENT_SOURCE_DIR}/../../include/atmi_kl.h ${OUTPUT_INC_DIRECTORY}/atmi_kl.h
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../../include/*.h
)
add_custom_target(device_header ALL DEPENDS ${OUTPUT_INC_DIRECTORY}/atmi_kl.h)
diff --git a/src/runtime/core/CMakeLists.txt b/src/runtime/core/CMakeLists.txt
index 132a2f6..034a728 100644
--- a/src/runtime/core/CMakeLists.txt
+++ b/src/runtime/core/CMakeLists.txt
@@ -128,13 +128,13 @@ execute_process(COMMAND "/bin/mkdir" "-p" "${OUTPUT_INC_DIRECTORY}")
add_custom_command(
OUTPUT ${OUTPUT_INC_DIRECTORY}/atmi.h
- COMMAND /usr/bin/rsync ${CMAKE_CURRENT_SOURCE_DIR}/../../../include/atmi.h ${OUTPUT_INC_DIRECTORY}/atmi.h
+ COMMAND rsync ${CMAKE_CURRENT_SOURCE_DIR}/../../../include/atmi.h ${OUTPUT_INC_DIRECTORY}/atmi.h
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../../../include/*.h
)
add_custom_command(
OUTPUT ${OUTPUT_INC_DIRECTORY}/atmi_runtime.h
- COMMAND /usr/bin/rsync ${CMAKE_CURRENT_SOURCE_DIR}/../../../include/atmi_runtime.h ${OUTPUT_INC_DIRECTORY}/atmi_runtime.h
+ COMMAND rsync ${CMAKE_CURRENT_SOURCE_DIR}/../../../include/atmi_runtime.h ${OUTPUT_INC_DIRECTORY}/atmi_runtime.h
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../../../include/*.h
)
diff --git a/src/runtime/interop/hsa/CMakeLists.txt b/src/runtime/interop/hsa/CMakeLists.txt
index f868972..97d8ae8 100644
--- a/src/runtime/interop/hsa/CMakeLists.txt
+++ b/src/runtime/interop/hsa/CMakeLists.txt
@@ -22,7 +22,7 @@ execute_process(COMMAND "/bin/mkdir" "-p" "${OUTPUT_INC_DIRECTORY}")
add_custom_command(
OUTPUT ${OUTPUT_INC_DIRECTORY}/atmi_interop_hsa.h
- COMMAND /usr/bin/rsync ${CMAKE_CURRENT_SOURCE_DIR}/../../../../include/atmi_interop_hsa.h ${OUTPUT_INC_DIRECTORY}/atmi_interop_hsa.h
+ COMMAND rsync ${CMAKE_CURRENT_SOURCE_DIR}/../../../../include/atmi_interop_hsa.h ${OUTPUT_INC_DIRECTORY}/atmi_interop_hsa.h
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../../../../include/*.h
)

View file

@ -32,6 +32,8 @@ class Atmi(CMakePackage):
variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type') variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type')
depends_on('cmake@3:', type='build') depends_on('cmake@3:', type='build')
depends_on('rsync')
for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0', for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0',
'4.2.0', '4.3.0', '4.3.1']: '4.2.0', '4.3.0', '4.3.1']:
depends_on('comgr@' + ver, type='link', when='@' + ver) depends_on('comgr@' + ver, type='link', when='@' + ver)
@ -41,6 +43,7 @@ class Atmi(CMakePackage):
root_cmakelists_dir = 'src' root_cmakelists_dir = 'src'
patch('0001-Remove-relative-link-paths-to-external-libraries.patch', when='@3.5.0') patch('0001-Remove-relative-link-paths-to-external-libraries.patch', when='@3.5.0')
patch('0002-Remove-usr-bin-rsync-reference.patch', when='@4.0.0:')
def cmake_args(self): def cmake_args(self):
return [ return [