valitydev/osquery-1
14
0
Fork 0
mirror of https://github.com/valitydev/osquery-1.git synced 2024-11-06 09:35:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CMake detect MAJOR_IN_SYSMACROS/MKDEV for librpm (#6554)

Browse Source 
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.
This commit is contained in:
AE1020 2020-08-02 12:00:33 -04:00 committed by GitHub
parent ffdd5763a8
commit 7a148eea0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libraries/cmake/source/librpm/CMakeLists.txt
View File

@ -131,6 +131,32 @@ function(librpmMain)
SYSCONFDIR="/usr/local/etc"
)
# 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 mirrors detection done by autoconf/headers.m4 as CMake code.
#
if(DEFINED PLATFORM_LINUX)
CHECK_SYMBOL_EXISTS(major "sys/mkdev.h" MAJOR_IN_MKDEV)
CHECK_SYMBOL_EXISTS(major "sys/sysmacros.h" MAJOR_IN_SYSMACROS)
if(MAJOR_IN_MKDEV)
target_compile_definitions(thirdparty_librpm PRIVATE
MAJOR_IN_MKDEV=1
)
endif()
if(MAJOR_IN_SYSMACROS)
target_compile_definitions(thirdparty_librpm PRIVATE
MAJOR_IN_SYSMACROS=1
)
endif()
endif()
target_link_libraries(thirdparty_librpm PUBLIC
thirdparty_berkeley-db
thirdparty_openssl