Bug#21785074 BUILD BREAKS IF COMPILED AGAINST OLDER NUMACTL HEADERS

Tor Didriksen · Tor Didriksen · commit 0c6a5d019440 · 2015-09-04T13:36:18.000+02:00
Fix: extend the cmake check with new numa features,
do not set HAVE_LIBNUMA if built against older numa headers.
diff --git a/configure.cmake b/configure.cmake
@@ -1146,10 +1146,13 @@ IF(HAVE_NUMAIF_H AND WITH_NUMA)
     SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} numa)
     CHECK_C_SOURCE_COMPILES(
     "
+    #include <numa.h>
     #include <numaif.h>
     int main()
     {
+       struct bitmask *all_nodes= numa_all_nodes_ptr;
        set_mempolicy(MPOL_DEFAULT, 0, 0);
+       return all_nodes != NULL;
     }"
     HAVE_LIBNUMA)
     SET(CMAKE_REQUIRED_LIBRARIES ${SAVE_CMAKE_REQUIRED_LIBRARIES})

Original file line number	Diff line number	Diff line change
`@@ -1146,10 +1146,13 @@ IF(HAVE_NUMAIF_H AND WITH_NUMA)`
`1146`	`1146`	`SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} numa)`
`1147`	`1147`	`CHECK_C_SOURCE_COMPILES(`
`1148`	`1148`	`"`
	`1149`	`+ #include <numa.h>`
`1149`	`1150`	`#include <numaif.h>`
`1150`	`1151`	`int main()`
`1151`	`1152`	`{`
	`1153`	`+ struct bitmask *all_nodes= numa_all_nodes_ptr;`
`1152`	`1154`	`set_mempolicy(MPOL_DEFAULT, 0, 0);`
	`1155`	`+ return all_nodes != NULL;`
`1153`	`1156`	`}"`
`1154`	`1157`	`HAVE_LIBNUMA)`
`1155`	`1158`	`SET(CMAKE_REQUIRED_LIBRARIES ${SAVE_CMAKE_REQUIRED_LIBRARIES})`