DAOS-16501 build: Support of mercury with ASan

Integrate reviewers comments:
- Fix CI integration
- Use of official mercury patch 74dda4a

Miscellaneous fixes related to package build.

Signed-off-by: Cedric Koch-Hofer <[email protected]>

Author: kanard38

debian/changelog

@@ -1,3 +1,34 @@
+daos (2.7.101-17) unstable; urgency=medium
+  [ Cedric Koch-Hofer]
+  * Add support of the libasan to the mercury dependencies
+
+ -- Cedric Koch-Hofer <[email protected]>  Mon, 27 Oct 2025 14:12:00 +0100
+
+daos (2.7.101-16) unstable; urgency=medium
+  [ Jeff Olivier]
+  * Make daos-spdk conflict with spdk
+
+ -- Jeff Olivier <[email protected]>  Mon, 19 May 2025 14:12:00 -0700
+
+daos (2.7.101-15) unstable; urgency=medium
+  [ Jeff Olivier]
+  * Fix leap package name
+
+ -- Jeff Olivier <[email protected]>  Fri, 12 Sep 2025 14:12:00 -0700
+
+daos (2.7.101-14) unstable; urgency=medium
+  [ Jeff Olivier]
+  * Fix pmdk package for leap
+  * Fix daos-spdk package
+
+ -- Jeff Olivier <[email protected]>  Thu, 11 Sep 2025 14:12:00 -0700
+
+daos (2.7.101-13) unstable; urgency=medium
+  [ Jeff Olivier]
+  * Switch to fpm build for RPMs
+
+ -- Jeff Olivier <[email protected]>  Mon, 11 Aug 2025 14:12:00 -0700
+
 daos (2.7.101-12) unstable; urgency=medium
   [ Tomasz Gromadzki ]
   * pmemobj errors and warnings reported via DAOS logging system

deps/patches/mercury/0004-CMake-add-MERCURY_LIB_DEBUG_NAME_IS_RELEASE-option.patch

@@ -0,0 +1,57 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c5161c1..e4e7971 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -170,6 +170,12 @@ else()
+   set(MERCURY_LIBTYPE STATIC)
+ endif()
+ 
++#------------------------------------------------------------------------------
++# Set debug lib name as release.
++#------------------------------------------------------------------------------
++option(MERCURY_LIB_DEBUG_NAME_IS_RELEASE "Set debug library name as release." OFF)
++mark_as_advanced(MERCURY_LIB_DEBUG_NAME_IS_RELEASE)
++
+ #------------------------------------------------------------------------------
+ # Enable debug output.
+ #------------------------------------------------------------------------------
+@@ -237,16 +243,29 @@ function(mercury_set_lib_options libtarget libname libtype var_prefix)
+     endif()
+   endif()
+ 
+-  set_target_properties(${libtarget}
+-      PROPERTIES
+-      OUTPUT_NAME_DEBUG          ${LIB_DEBUG_NAME}
+-      OUTPUT_NAME_RELEASE        ${LIB_RELEASE_NAME}
+-      OUTPUT_NAME_MINSIZEREL     ${LIB_RELEASE_NAME}
+-      OUTPUT_NAME_RELWITHDEBINFO ${LIB_RELEASE_NAME}
+-      OUTPUT_NAME_ASAN           ${LIB_DEBUG_NAME}
+-      OUTPUT_NAME_TSAN           ${LIB_DEBUG_NAME}
+-      OUTPUT_NAME_UBSAN          ${LIB_DEBUG_NAME}
+-  )
++  if(NOT MERCURY_LIB_DEBUG_NAME_IS_RELEASE)
++    set_target_properties(${libtarget}
++        PROPERTIES
++        OUTPUT_NAME_DEBUG          ${LIB_DEBUG_NAME}
++        OUTPUT_NAME_RELEASE        ${LIB_RELEASE_NAME}
++        OUTPUT_NAME_MINSIZEREL     ${LIB_RELEASE_NAME}
++        OUTPUT_NAME_RELWITHDEBINFO ${LIB_RELEASE_NAME}
++        OUTPUT_NAME_ASAN           ${LIB_DEBUG_NAME}
++        OUTPUT_NAME_TSAN           ${LIB_DEBUG_NAME}
++        OUTPUT_NAME_UBSAN          ${LIB_DEBUG_NAME}
++    )
++  else()
++    set_target_properties(${libtarget}
++        PROPERTIES
++        OUTPUT_NAME_DEBUG          ${LIB_RELEASE_NAME}
++        OUTPUT_NAME_RELEASE        ${LIB_RELEASE_NAME}
++        OUTPUT_NAME_MINSIZEREL     ${LIB_RELEASE_NAME}
++        OUTPUT_NAME_RELWITHDEBINFO ${LIB_RELEASE_NAME}
++        OUTPUT_NAME_ASAN           ${LIB_RELEASE_NAME}
++        OUTPUT_NAME_TSAN           ${LIB_RELEASE_NAME}
++        OUTPUT_NAME_UBSAN          ${LIB_RELEASE_NAME}
++    )
++  endif()
+   if(${libtype} MATCHES "SHARED")
+     set_target_properties(${libtarget}
+         PROPERTIES

deps/patches/mercury/0004_asan_workaround.patch

@@ -219,6 +219,8 @@ def define_mercury(reqs):
     except KeyError:
         pass
     mercury_build.append(f'-DCMAKE_BUILD_TYPE:STRING={build_type}')
+    if build_type != "RelWithDebInfo":
+        mercury_build.append('-DMERCURY_LIB_DEBUG_NAME_IS_RELEASE:BOOL=ON')
 
     if reqs.target_type == 'debug':
         mercury_build.append('-DMERCURY_ENABLE_DEBUG:BOOL=ON')

site_scons/components/__init__.py

@@ -27,5 +27,5 @@ ucx=https://github.com/openucx/ucx.git
 
 [patch_versions]
 spdk=0001_b0aba3fcd5aceceea530a702922153bc75664978.diff,0002_445a4c808badbad3942696ecf16fa60e8129a747.diff
-mercury=0001_na_ucx.patch,0002_na_ucx_ep_flush.patch,0003_combined_plugin_path.patch,0004_asan_workaround.patch
+mercury=0001_na_ucx.patch,0002_na_ucx_ep_flush.patch,0003_combined_plugin_path.patch,0004-CMake-add-MERCURY_LIB_DEBUG_NAME_IS_RELEASE-option.patch
 argobots=0001_411e5b344642ebc82190fd8b125db512e5b449d1.diff,0002_bb0c908abfac4bfe37852eee621930634183c6aa.diff

utils/build.config

@@ -25,7 +25,7 @@
 
 Name:          daos
 Version:       2.7.101
-Release:       16%{?relval}%{?dist}
+Release:       17%{?relval}%{?dist}
 Summary:       DAOS Storage Engine
 
 License:       BSD-2-Clause-Patent
@@ -659,10 +659,13 @@ fi
 %endif
 
 %changelog
+* Mon Oct 27 2025  Cedric Koch-Hofer <[email protected]> 2.7.101-17
+- Add support of the libasan to the mercury dependencies
+
 * Thu Oct 16 2025  Jeff Olivier <[email protected]> 2.7.101-16
 - Make daos-spdk conflict with spdk
 
-* Thu Sep 12 2025  Jeff Olivier <[email protected]> 2.7.101-15
+* Fri Sep 12 2025  Jeff Olivier <[email protected]> 2.7.101-15
 - Fix leap package name
 
 * Thu Sep 11 2025  Jeff Olivier <[email protected]> 2.7.101-14

utils/rpms/daos.spec

@@ -38,7 +38,7 @@ export libfabric_version="1.22.0"
 export libfabric_release="4${distro_name}"
 export libfabric_full="${libfabric_version}-${libfabric_release}"
 export mercury_version="2.4.0"
-export mercury_release="7${distro_name}"
+export mercury_release="8${distro_name}"
 export mercury_full="${mercury_version}-${mercury_release}"
 export argobots_version="1.2"
 export argobots_release="3${distro_name}"