From: Andriy Tkachuk Date: Wed, 28 Sep 2022 19:29:09 +0000 (+0100) Subject: compressor: fix rpmbuild on RHEL-8 X-Git-Tag: v18.1.0~1102^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F48287%2Fhead;p=ceph.git compressor: fix rpmbuild on RHEL-8 When building rpms on latest RHEL-8.6: [ 0%] Building CXX object src/compressor/CMakeFiles/compressor_objs.dir/Compressor.cc.o In file included from /d/ceph-build/ceph-17.2.3-0-dff484dfc9e/src/common/config_values.h:59, from /d/ceph-build/ceph-17.2.3-0-dff484dfc9e/src/common/config.h:27, from /d/ceph-build/ceph-17.2.3-0-dff484dfc9e/src/common/config_proxy.h:6, from /d/ceph-build/ceph-17.2.3-0-dff484dfc9e/src/common/ceph_context.h:41, from /d/ceph-build/ceph-17.2.3-0-dff484dfc9e/src/compressor/Compressor.cc:23: /d/ceph-build/ceph-17.2.3-0-dff484dfc9e/src/common/options/legacy_config_opts.h:1:10: fatal error: global_legacy_options.h: No such file or directory 1 | #include "global_legacy_options.h" | ^~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. make[2]: *** [src/compressor/CMakeFiles/compressor_objs.dir/build.make:76: src/compressor/CMakeFiles/compressor_objs.dir/Compressor.cc.o] Error 1 make[1]: *** [CMakeFiles/Makefile2:7964: src/compressor/CMakeFiles/compressor_objs.dir/all] Error 2 make: *** [Makefile:146: all] Error 2 error: Bad exit status from /var/tmp/rpm-tmp.1CBUsC (%build) RPM build errors: Bad exit status from /var/tmp/rpm-tmp.1CBUsC (%build) Solution: add legacy-option-headers dependency to compressor_objs. Signed-off-by: Andriy Tkachuk --- diff --git a/src/compressor/CMakeLists.txt b/src/compressor/CMakeLists.txt index 0155e9e530a6..3e99f8b73875 100644 --- a/src/compressor/CMakeLists.txt +++ b/src/compressor/CMakeLists.txt @@ -13,6 +13,7 @@ if(HAVE_QATZIP AND HAVE_QATDRV) qatzip::qatzip ) endif() +add_dependencies(compressor_objs legacy-option-headers) ## compressor plugins