Commit bf5d32f4 for xz
commit bf5d32f489fd7f33b2a629f9b78f5157301b49d8
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Tue Feb 24 18:22:25 2026 +0200
CMake: Fix a wrong #define
HAVE_SYS_PARAM_H was misspelled HAVE_PARAM_H. This might have broken
the build on systems where sysctl() is used to detect the amount of RAM
or the number of processor cores/threads.
The cpuset code for FreeBSD doesn't need the macro it so it was removed.
Fixes: https://github.com/dotnet/runtime/pull/124003#discussion_r2782313680
Fixes: https://github.com/dotnet/runtime/pull/124003#discussion_r2782313704
Fixes: 7e3493d40eac ("Build: Add very limited experimental CMake support.")
diff --git a/cmake/tuklib_cpucores.cmake b/cmake/tuklib_cpucores.cmake
index 05f3ceef..19ae7aa2 100644
--- a/cmake/tuklib_cpucores.cmake
+++ b/cmake/tuklib_cpucores.cmake
@@ -65,7 +65,7 @@ function(tuklib_cpucores_internal_check)
"
TUKLIB_CPUCORES_CPUSET)
if(TUKLIB_CPUCORES_CPUSET)
- set(TUKLIB_CPUCORES_DEFINITIONS "HAVE_PARAM_H;TUKLIB_CPUCORES_CPUSET"
+ set(TUKLIB_CPUCORES_DEFINITIONS "TUKLIB_CPUCORES_CPUSET"
CACHE INTERNAL "")
return()
endif()
@@ -109,7 +109,7 @@ function(tuklib_cpucores_internal_check)
if(TUKLIB_CPUCORES_SYSCTL)
if(HAVE_SYS_PARAM_H)
set(TUKLIB_CPUCORES_DEFINITIONS
- "HAVE_PARAM_H;TUKLIB_CPUCORES_SYSCTL"
+ "HAVE_SYS_PARAM_H;TUKLIB_CPUCORES_SYSCTL"
CACHE INTERNAL "")
else()
set(TUKLIB_CPUCORES_DEFINITIONS
diff --git a/cmake/tuklib_physmem.cmake b/cmake/tuklib_physmem.cmake
index d4d3f3d2..2e6ee635 100644
--- a/cmake/tuklib_physmem.cmake
+++ b/cmake/tuklib_physmem.cmake
@@ -101,7 +101,7 @@ function(tuklib_physmem_internal_check)
if(TUKLIB_PHYSMEM_SYSCTL)
if(HAVE_SYS_PARAM_H)
set(TUKLIB_PHYSMEM_DEFINITIONS
- "HAVE_PARAM_H;TUKLIB_PHYSMEM_SYSCTL"
+ "HAVE_SYS_PARAM_H;TUKLIB_PHYSMEM_SYSCTL"
CACHE INTERNAL "")
else()
set(TUKLIB_PHYSMEM_DEFINITIONS