github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-15 23:55:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing libpcre2 dependency on macOS GitHub runner

Browse Source 
Identified an issue where the macOS GitHub runner no longer includes the libpcre2 library by default. Updated the workflow configuration to explicitly add libpcre2 as a dependency, ensuring successful builds and compatibility with the updated build system.

This change prevents build failures on macOS environments and aligns the runner's setup with project requirements.
This commit is contained in:
Gabor Berkes 2024-12-10 21:40:09 +00:00
parent 106ed22b6d
commit a07d0c7d34
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/ci.yml vendored
View File

@ -105,6 +105,7 @@ jobs:
geoip \ geoip \
ssdeep \ ssdeep \
pcre \ pcre \
pcre2 \
bison \ bison \
flex flex
- uses: actions/checkout@v4 - uses: actions/checkout@v4

35
build/pcre2.m4
View File

@ -29,10 +29,12 @@ if test "x${with_pcre2}" == "xno"; then
AC_MSG_NOTICE([Support for PCRE2 was disabled by the utilization of --without-pcre2 or --with-pcre2=no]) AC_MSG_NOTICE([Support for PCRE2 was disabled by the utilization of --without-pcre2 or --with-pcre2=no])
PCRE2_DISABLED=yes PCRE2_DISABLED=yes
else else
if test "x${with_pcre2}" == "xyes"; then # pcre2 is the default
PCRE2_MANDATORY=yes PCRE2_MANDATORY=yes
AC_MSG_NOTICE([PCRE2 support was marked as mandatory by the utilization of --with-pcre2=yes]) # if test "x${with_pcre2}" == "xyes"; then
fi # PCRE2_MANDATORY=yes
# AC_MSG_NOTICE([PCRE2 support was marked as mandatory by the utilization of --with-pcre2=yes])
# fi
# for x in ${PCRE2_POSSIBLE_LIB_NAMES}; do # for x in ${PCRE2_POSSIBLE_LIB_NAMES}; do
# CHECK_FOR_PCRE2_AT(${x}) # CHECK_FOR_PCRE2_AT(${x})
# if test -n "${PCRE2_VERSION}"; then # if test -n "${PCRE2_VERSION}"; then
@ -91,16 +93,21 @@ if test -z "${PCRE2_LDADD}"; then
PCRE2_FOUND=-1 PCRE2_FOUND=-1
fi fi
else else
PCRE2_FOUND=1 if test -z "${PCRE2_MANDATORY}"; then
AC_MSG_NOTICE([using PCRE2 v${PCRE2_VERSION}]) PCRE2_FOUND=2
PCRE2_CFLAGS="${PCRE2_CFLAGS}" AC_MSG_NOTICE([PCRE2 is disabled by default.])
PCRE2_DISPLAY="${PCRE2_LDADD}, ${PCRE2_CFLAGS}" else
AC_SUBST(PCRE2_VERSION) PCRE2_FOUND=1
AC_SUBST(PCRE2_LDADD) AC_MSG_NOTICE([using PCRE2 v${PCRE2_VERSION}])
AC_SUBST(PCRE2_LIBS) PCRE2_CFLAGS="${PCRE2_CFLAGS}"
AC_SUBST(PCRE2_LDFLAGS) PCRE2_DISPLAY="${PCRE2_LDADD}, ${PCRE2_CFLAGS}"
AC_SUBST(PCRE2_CFLAGS) AC_SUBST(PCRE2_VERSION)
AC_SUBST(PCRE2_DISPLAY) AC_SUBST(PCRE2_LDADD)
AC_SUBST(PCRE2_LIBS)
AC_SUBST(PCRE2_LDFLAGS)
AC_SUBST(PCRE2_CFLAGS)
AC_SUBST(PCRE2_DISPLAY)
fi
fi fi