]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
compressor/zlib: Fix for ISA-L 2.32.0 build on aarch64 67749/head
authorJamie Pryde <jamiepry@uk.ibm.com>
Thu, 12 Mar 2026 16:55:40 +0000 (16:55 +0000)
committerJamie Pryde <jamiepry@uk.ibm.com>
Thu, 12 Mar 2026 16:55:40 +0000 (16:55 +0000)
ISA-L has updated the aarch64 multibinary dispatcher
(igzip_multibinary_aarch64_dispatcher.c) to include an internal header
"igzip/encode_df.h".

ceph_zlib fails to build because it compiles this dispatcher directly
on aarch64 but only has the isa-l "include" dir in the search path.

This commit add the isa-l root to the search path so that we can find encode_df.h

Signed-off-by: Jamie Pryde <jamiepry@uk.ibm.com>
src/compressor/zlib/CMakeLists.txt

index b08543c0642a277fdc9ade89b4e96d283c10e22b..32660254649971d845885baf195fe7d687d0ce42 100644 (file)
@@ -97,7 +97,7 @@ endif()
 if(HAVE_UADK)
   target_link_libraries(ceph_zlib uadk_compressor)
 endif()
-target_include_directories(ceph_zlib SYSTEM PRIVATE "${CMAKE_SOURCE_DIR}/src/isa-l/include")
+target_include_directories(ceph_zlib SYSTEM PRIVATE "${CMAKE_SOURCE_DIR}/src/isa-l/include" "${CMAKE_SOURCE_DIR}/src/isa-l")
 set_target_properties(ceph_zlib PROPERTIES
   VERSION 2.0.0
   SOVERSION 2