remove some kokkos test declarations that cause configure failures diff --git a/packages/kokkos/cmake/kokkos_tribits.cmake b/packages/kokkos/cmake/kokkos_tribits.cmake index afa036066a..edce81ad07 100644
Avoid multiarch conflict As per Debian's multiarch hinter: libtrilinos-stokhos-dev conflicts on /usr/include/trilinos/Stokhos_config.h on amd64 <-> arm64, mips64el, ppc64el, s390x . Make the header file identical across all architectures by defining HAVE_STOKHOS_INTRINSICS on amd64 and i386 where immintrin.h is available.
Add major.minor soname version to shared libraries diff --git a/cmake/tribits/core/package_arch/TribitsLibraryMacros.cmake b/cmake/tribits/core/package_arch/TribitsLibraryMacros.cmake index cc97f07b5e..d5c6b33517 100644
