Skip to content

Commit a07d0c7

Browse files
author
Gabor Berkes
committed
Fix missing libpcre2 dependency on macOS GitHub runner
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.
1 parent 106ed22 commit a07d0c7

File tree

2 files changed

+22
-14
lines changed

2 files changed

+22
-14
lines changed

.github/workflows/ci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ jobs:
105105
geoip \
106106
ssdeep \
107107
pcre \
108+
pcre2 \
108109
bison \
109110
flex
110111
- uses: actions/checkout@v4

build/pcre2.m4

+21-14
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,12 @@ if test "x${with_pcre2}" == "xno"; then
2929
AC_MSG_NOTICE([Support for PCRE2 was disabled by the utilization of --without-pcre2 or --with-pcre2=no])
3030
PCRE2_DISABLED=yes
3131
else
32-
if test "x${with_pcre2}" == "xyes"; then
33-
PCRE2_MANDATORY=yes
34-
AC_MSG_NOTICE([PCRE2 support was marked as mandatory by the utilization of --with-pcre2=yes])
35-
fi
32+
# pcre2 is the default
33+
PCRE2_MANDATORY=yes
34+
# if test "x${with_pcre2}" == "xyes"; then
35+
# PCRE2_MANDATORY=yes
36+
# AC_MSG_NOTICE([PCRE2 support was marked as mandatory by the utilization of --with-pcre2=yes])
37+
# fi
3638
# for x in ${PCRE2_POSSIBLE_LIB_NAMES}; do
3739
# CHECK_FOR_PCRE2_AT(${x})
3840
# if test -n "${PCRE2_VERSION}"; then
@@ -91,16 +93,21 @@ if test -z "${PCRE2_LDADD}"; then
9193
PCRE2_FOUND=-1
9294
fi
9395
else
94-
PCRE2_FOUND=1
95-
AC_MSG_NOTICE([using PCRE2 v${PCRE2_VERSION}])
96-
PCRE2_CFLAGS="${PCRE2_CFLAGS}"
97-
PCRE2_DISPLAY="${PCRE2_LDADD}, ${PCRE2_CFLAGS}"
98-
AC_SUBST(PCRE2_VERSION)
99-
AC_SUBST(PCRE2_LDADD)
100-
AC_SUBST(PCRE2_LIBS)
101-
AC_SUBST(PCRE2_LDFLAGS)
102-
AC_SUBST(PCRE2_CFLAGS)
103-
AC_SUBST(PCRE2_DISPLAY)
96+
if test -z "${PCRE2_MANDATORY}"; then
97+
PCRE2_FOUND=2
98+
AC_MSG_NOTICE([PCRE2 is disabled by default.])
99+
else
100+
PCRE2_FOUND=1
101+
AC_MSG_NOTICE([using PCRE2 v${PCRE2_VERSION}])
102+
PCRE2_CFLAGS="${PCRE2_CFLAGS}"
103+
PCRE2_DISPLAY="${PCRE2_LDADD}, ${PCRE2_CFLAGS}"
104+
AC_SUBST(PCRE2_VERSION)
105+
AC_SUBST(PCRE2_LDADD)
106+
AC_SUBST(PCRE2_LIBS)
107+
AC_SUBST(PCRE2_LDFLAGS)
108+
AC_SUBST(PCRE2_CFLAGS)
109+
AC_SUBST(PCRE2_DISPLAY)
110+
fi
104111
fi
105112
106113

0 commit comments

Comments
 (0)