Merge pull request hpcc-systems#19104 from GordonSmith/HPCC-31503-OPE…

…NBLAS_CENTOS8 HPCC-31503 OpenBLAS ELF alignment issue
ghalliday · Sep 20, 2024 · c840ad0 · c840ad0
2 parents 91fb11c + 098e817
commit c840ad0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/cmake_modules/options.cmake b/cmake_modules/options.cmake
@@ -71,6 +71,7 @@ option(INSTALL_VCPKG_CATALOG "Install vcpkg-catalog.txt" ON)
 option(PORTALURL "Set url to hpccsystems portal download page")
 option(PROFILING "Set to true if planning to profile so stacks are informative" OFF)
 option(COLLECT_SERVICE_METRICS "Set to true to gather metrics for HIDL services by default" OFF)
+option(VCPKG_ECLBLAS_DYNAMIC_ARCH "Set to ON to build eclblas with dynamic architecture" ON)
 
 set(CUSTOM_LABEL "" CACHE STRING "Appends a custom label to the final package name")
 

diff --git a/cmake_modules/plugins.cmake b/cmake_modules/plugins.cmake
@@ -155,6 +155,12 @@ if (USE_ZLIB)
     set(VCPKG_ZLIB "${VCPKG_INCLUDE}")
 endif()
 
+if (VCPKG_ECLBLAS_DYNAMIC_ARCH)
+    set(VCPKG_ECLBLAS_DYNAMIC_ARCH_FEATURE "\"dynamic-arch\",")
+else ()
+    set(VCPKG_ECLBLAS_DYNAMIC_ARCH_FEATURE "")
+endif()
+
 configure_file("${HPCC_SOURCE_DIR}/vcpkg.json.in" "${HPCC_SOURCE_DIR}/vcpkg.json")
 
 endif()
diff --git a/vcpkg.json.in b/vcpkg.json.in
@@ -150,7 +150,7 @@
         {
             "name": "openblas",
             "features": [
-                "dynamic-arch",
+                @VCPKG_ECLBLAS_DYNAMIC_ARCH_FEATURE@
                 "threads"
             ],
             "platform": "@VCPKG_ECLBLAS@ & !windows"