mirror of
https://github.com/valitydev/osquery-1.git
synced 2024-11-07 01:55:20 +00:00
7a148eea0b
Starting in glibc 2.25, the macros `major` and `minor` were moved from `<sys/types.h>` to `<sys/sysmacros.h>`, to stop leaking these common words into the global namespace of those including <stdlib.h> https://sourceware.org/bugzilla/show_bug.cgi?format=multiple&id=19239 The macros MAJOR_IN_MKDEV and MAJOR_IN_SYSMACROS would be defined if necessary by autoconfig, and put in `config.h`. But osquery build uses CMake instead of autotools, with a git-committed `config.h`. This generally is all right across Ubuntu variations, as an automake for one will likely make a config.h that works on others. However the glibc change makes a "one-size-fits-all-Ubuntu" config impossible. This mirrors detection done by autoconf/headers.m4 as CMake code. It is a relatively simple patch, which unblocks building of librpm on (K)ubuntu 20 while still working on Ubuntu 18. |
||
---|---|---|
.. | ||
cmake | ||
CMakeLists.txt |