]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: add empty RPATH to ceph-diff-sorted 36120/head
authorNathan Cutler <ncutler@suse.com>
Wed, 15 Jul 2020 16:21:37 +0000 (18:21 +0200)
committerNathan Cutler <ncutler@suse.com>
Mon, 11 Jan 2021 12:27:37 +0000 (13:27 +0100)
This fixes a transient FTBFS on openSUSE:

[ 5365s] -- Installing: /home/abuild/rpmbuild/BUILDROOT/ceph-15.2.4.337+g55cec95eaf-1.1.x86_64/usr/bin/ceph-diff-sorted
[ 5365s] CMake Error at src/tools/cmake_install.cmake:230 (file):
[ 5365s]   file RPATH_CHANGE could not write new RPATH:
[ 5365s]
[ 5365s]     /usr/lib64/ceph
[ 5365s]
[ 5365s]   to the file:
[ 5365s]
[ 5365s]     /home/abuild/rpmbuild/BUILDROOT/ceph-15.2.4.337+g55cec95eaf-1.1.x86_64/usr/bin/ceph-diff-sorted
[ 5365s]
[ 5365s]   No valid ELF RPATH or RUNPATH entry exists in the file;

Fixes: https://tracker.ceph.com/issues/46553
Signed-off-by: Nathan Cutler <ncutler@suse.com>
src/tools/CMakeLists.txt

index b2a41b2e52b366c74ad63b2fcdecf6493f74bba3..fb079b6a80aa88165a677b873e5c0971da08a0dd 100644 (file)
@@ -100,6 +100,9 @@ install(TARGETS osdmaptool DESTINATION bin)
 
 set(ceph-diff-sorted_srcs ceph-diff-sorted.cc)
 add_executable(ceph-diff-sorted ${ceph-diff-sorted_srcs})
+set_target_properties(ceph-diff-sorted PROPERTIES
+  SKIP_RPATH TRUE
+  INSTALL_RPATH "")
 install(TARGETS ceph-diff-sorted DESTINATION bin)
 
 if(WITH_TESTS)