mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 03:44:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Autotools: Use FPM_EXTRA_LIBS for SELinux library (#14885)

Browse Source 
Instead of appending -lselinux to global LIBS variable, this adds it as
needed only to FPM_EXTRA_LIBS as it was already used in the BUILD_FPM
invocation.

Follow-up of GH-14881
This commit is contained in:
Peter Kokot 2024-07-13 01:20:44 +02:00 committed by GitHub
parent 2ea79c024c
commit fb5d64c300
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sapi/fpm/config.m4
View File

@ -427,7 +427,8 @@ if test "$PHP_FPM" != "no"; then
[no],
[no])
PHP_ARG_WITH([fpm-selinux],,
PHP_ARG_WITH([fpm-selinux],
[whether to enable SELinux support in PHP-FPM],
[AS_HELP_STRING([--with-fpm-selinux],
[Support SELinux policy library])],
[no],
@ -502,23 +503,23 @@ if test "$PHP_FPM" != "no"; then
CFLAGS=$CFLAGS_save
])
if test "x$PHP_FPM_SELINUX" != "xno" ; then
PKG_CHECK_MODULES([SELINUX], [libselinux], [
PHP_EVAL_LIBLINE([$SELINUX_LIBS])
PHP_EVAL_INCLINE([$SELINUX_CFLAGS])
],
AS_VAR_IF([PHP_FPM_SELINUX], [no],, [
PKG_CHECK_MODULES([SELINUX], [libselinux],
[PHP_EVAL_INCLINE([$SELINUX_CFLAGS])],
[AC_CHECK_LIB([selinux], [security_setenforce],
[PHP_ADD_LIBRARY([selinux])],
[SELINUX_LIBS=-lselinux],
[AC_MSG_ERROR([Required SELinux library not found.])])])
PHP_EVAL_LIBLINE([$SELINUX_LIBS], [FPM_EXTRA_LIBS], [yes])
dnl Sanity check.
CFLAGS_save="$CFLAGS"
CFLAGS_save=$CFLAGS
CFLAGS="$INCLUDES $CFLAGS"
AC_CHECK_HEADER([selinux/selinux.h],
[AC_DEFINE([HAVE_SELINUX], [1], [Whether SELinux is available.])],
[AC_DEFINE([HAVE_SELINUX], [1],
[Define to 1 if SELinux is available in PHP-FPM.])],
[AC_MSG_ERROR([Required selinux/selinux.h not found.])])
CFLAGS="$CFLAGS_save"
fi
CFLAGS=$CFLAGS_save
])
if test -z "$PHP_FPM_USER" || test "$PHP_FPM_USER" = "yes" || test "$PHP_FPM_USER" = "no"; then
php_fpm_user="nobody"