]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
build/rgw: unittest_rgw_dmclock_scheduler does not need Boost_LIBRARIES 27944/head
authorWillem Jan Withagen <wjw@digiware.nl>
Tue, 9 Apr 2019 14:49:09 +0000 (16:49 +0200)
committerNathan Cutler <ncutler@suse.com>
Fri, 3 May 2019 09:45:12 +0000 (11:45 +0200)
Redo fix, also see #26799

Otherwise linking could error like:
```
/usr/local/bin/ld: /usr/local/lib/libboost_python27.so: undefined reference to `PyUnicodeUCS4_FromEncodedObject'
/usr/local/bin/ld: /usr/local/lib/libboost_python27.so: undefined reference to `PyNumber_InPlaceDivide'
........
/usr/local/bin/ld: /usr/local/lib/libboost_python27.so: undefined reference to `PyStaticMethod_Type'
/usr/local/bin/ld: /usr/local/lib/libboost_python27.so: undefined reference to `PyTuple_Size'
c++: error: linker command failed with exit code 1 (use -v to see invocation)
gmake[2]: *** [src/test/rgw/CMakeFiles/unittest_rgw_dmclock_scheduler.dir/build.make:147: bin/unittest_rgw_dmclock_scheduler] Error 1
```

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
(cherry picked from commit d24aa4f36bc4e308bf5e39ac3b29af900e02b024)

src/test/rgw/CMakeLists.txt

index 60c4974e1b0dc4123f4e2e3b09d76f27d1b779c2..36df883a66fb9a3b183dc3a81ab1f3f9a7621b84 100644 (file)
@@ -141,7 +141,7 @@ add_ceph_unittest(unittest_rgw_string)
 add_executable(unittest_rgw_dmclock_scheduler test_rgw_dmclock_scheduler.cc $<TARGET_OBJECTS:unit-main>)
 add_ceph_unittest(unittest_rgw_dmclock_scheduler)
 
-target_link_libraries(unittest_rgw_dmclock_scheduler radosgw_a dmclock ${Boost_LIBRARIES})
+target_link_libraries(unittest_rgw_dmclock_scheduler radosgw_a dmclock)
 if(WITH_BOOST_CONTEXT)
   target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING)
   target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context)