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

Fix macOS GitHub Actions build: add PCRE2_CFLAGS/LDADD/LDFLAGS

Browse Source 
Introduced PCRE2_CFLAGS, PCRE2_LDADD, and PCRE2_LDFLAGS in all relevant Makefile.am files to align with the existing PCRE_* variable usage. This change addresses potential issues with linking and configuration for builds on macOS GitHub runners.

These modifications aim to resolve the build failure observed exclusively in the macOS environment while maintaining compatibility across other platforms. Testing will confirm if this adjustment corrects the issue.
This commit is contained in:
Gabor Berkes 2024-12-11 12:48:20 +00:00
parent 784cf0b64c
commit e92507868e
8 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/multithread/Makefile.am
View File

@ -14,6 +14,7 @@ multithread_LDADD = \
$(MAXMIND_LDADD) \ $(MAXMIND_LDADD) \
$(LUA_LDADD) \ $(LUA_LDADD) \
$(PCRE_LDADD) \ $(PCRE_LDADD) \
$(PCRE2_LDADD) \
$(SSDEEP_LDADD) \ $(SSDEEP_LDADD) \
$(YAJL_LDADD) $(YAJL_LDADD)
@ -46,6 +47,7 @@ multithread_CPPFLAGS = \
$(LMDB_CFLAGS) \ $(LMDB_CFLAGS) \
$(LUA_CFLAGS) \ $(LUA_CFLAGS) \
$(PCRE_CFLAGS) \ $(PCRE_CFLAGS) \
$(PCRE2_CFLAGS) \
$(LIBXML2_CFLAGS) $(LIBXML2_CFLAGS)

2
examples/reading_logs_via_rule_message/Makefile.am
View File

@ -14,6 +14,7 @@ simple_request_LDADD = \
$(MAXMIND_LDADD) \ $(MAXMIND_LDADD) \
$(LUA_LDADD) \ $(LUA_LDADD) \
$(PCRE_LDADD) \ $(PCRE_LDADD) \
$(PCRE2_LDADD) \
$(SSDEEP_LDADD) \ $(SSDEEP_LDADD) \
$(YAJL_LDADD) $(YAJL_LDADD)
@ -46,6 +47,7 @@ simple_request_CPPFLAGS = \
$(LMDB_CFLAGS) \ $(LMDB_CFLAGS) \
$(LUA_CFLAGS) \ $(LUA_CFLAGS) \
$(PCRE_CFLAGS) \ $(PCRE_CFLAGS) \
$(PCRE2_CFLAGS) \
$(LIBXML2_CFLAGS) $(LIBXML2_CFLAGS)

2
examples/reading_logs_with_offset/Makefile.am
View File

@ -14,6 +14,7 @@ read_LDADD = \
$(LMDB_LDADD) \ $(LMDB_LDADD) \
$(LUA_LDADD) \ $(LUA_LDADD) \
$(PCRE_LDADD) \ $(PCRE_LDADD) \
$(PCRE2_LDADD) \
$(SSDEEP_LDADD) \ $(SSDEEP_LDADD) \
$(YAJL_LDADD) $(YAJL_LDADD)
@ -46,6 +47,7 @@ read_CPPFLAGS = \
$(LMDB_CFLAGS) \ $(LMDB_CFLAGS) \
$(LUA_CFLAGS) \ $(LUA_CFLAGS) \
$(PCRE_CFLAGS) \ $(PCRE_CFLAGS) \
$(PCRE2_CFLAGS) \
$(LIBXML2_CFLAGS) $(LIBXML2_CFLAGS)

2
examples/using_bodies_in_chunks/Makefile.am
View File

@ -14,6 +14,7 @@ simple_request_LDADD = \
$(LMDB_LDADD) \ $(LMDB_LDADD) \
$(LUA_LDADD) \ $(LUA_LDADD) \
$(PCRE_LDADD) \ $(PCRE_LDADD) \
$(PCRE2_LDADD) \
$(SSDEEP_LDADD) \ $(SSDEEP_LDADD) \
$(YAJL_LDADD) $(YAJL_LDADD)
@ -46,6 +47,7 @@ simple_request_CPPFLAGS = \
$(LMDB_CFLAGS) \ $(LMDB_CFLAGS) \
$(LUA_CFLAGS) \ $(LUA_CFLAGS) \
$(PCRE_CFLAGS) \ $(PCRE_CFLAGS) \
$(PCRE2_CFLAGS) \
$(LIBXML2_CFLAGS) $(LIBXML2_CFLAGS)
MAINTAINERCLEANFILES = \ MAINTAINERCLEANFILES = \

1
src/parser/Makefile.am
View File

@ -25,6 +25,7 @@ libmodsec_parser_la_CPPFLAGS = \
$(YAJL_CFLAGS) \ $(YAJL_CFLAGS) \
$(LMDB_CFLAGS) \ $(LMDB_CFLAGS) \
$(PCRE_CFLAGS) \ $(PCRE_CFLAGS) \
$(PCRE2_CFLAGS) \
$(LIBXML2_CFLAGS) $(LIBXML2_CFLAGS)
test.cc: seclang-parser.hh test.cc: seclang-parser.hh

2
test/benchmark/Makefile.am
View File

@ -10,6 +10,7 @@ benchmark_LDADD = \
$(GEOIP_LDADD) \ $(GEOIP_LDADD) \
$(MAXMIND_LDADD) \ $(MAXMIND_LDADD) \
$(PCRE_LDADD) \ $(PCRE_LDADD) \
$(PCRE2_LDADD) \
$(YAJL_LDADD) \ $(YAJL_LDADD) \
$(LMDB_LDADD) \ $(LMDB_LDADD) \
$(SSDEEP_LDADD) \ $(SSDEEP_LDADD) \
@ -35,6 +36,7 @@ benchmark_CPPFLAGS = \
-I$(top_builddir)/headers \ -I$(top_builddir)/headers \
$(GLOBAL_CPPFLAGS) \ $(GLOBAL_CPPFLAGS) \
$(PCRE_CFLAGS) \ $(PCRE_CFLAGS) \
$(PCRE2_CFLAGS) \
$(LMDB_CFLAGS) \ $(LMDB_CFLAGS) \
$(LIBXML2_CFLAGS) $(LIBXML2_CFLAGS)

2
test/fuzzer/Makefile.am
View File

@ -18,6 +18,7 @@ afl_fuzzer_LDADD = \
$(CURL_LDADD) \ $(CURL_LDADD) \
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \ $(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
$(PCRE_LDADD) \ $(PCRE_LDADD) \
$(PCRE2_LDADD) \
$(YAJL_LDFLAGS) $(YAJL_LDADD) \ $(YAJL_LDFLAGS) $(YAJL_LDADD) \
$(LMDB_LDFLAGS) $(LMDB_LDADD) \ $(LMDB_LDFLAGS) $(LMDB_LDADD) \
$(MAXMIND_LDFLAGS) $(MAXMIND_LDADD) \ $(MAXMIND_LDFLAGS) $(MAXMIND_LDADD) \
@ -44,4 +45,5 @@ afl_fuzzer_CPPFLAGS = \
$(YAJL_CFLAGS) \ $(YAJL_CFLAGS) \
$(LMDB_CFLAGS) \ $(LMDB_CFLAGS) \
$(PCRE_CFLAGS) \ $(PCRE_CFLAGS) \
$(PCRE2_CFLAGS) \
$(LIBXML2_CFLAGS) $(LIBXML2_CFLAGS)

2
tools/rules-check/Makefile.am
View File

@ -15,6 +15,7 @@ modsec_rules_check_LDADD = \
$(LMDB_LDADD) \ $(LMDB_LDADD) \
$(LUA_LDADD) \ $(LUA_LDADD) \
$(PCRE_LDADD) \ $(PCRE_LDADD) \
$(PCRE2_LDADD) \
$(SSDEEP_LDADD) \ $(SSDEEP_LDADD) \
$(YAJL_LDADD) $(YAJL_LDADD)
@ -31,6 +32,7 @@ modsec_rules_check_CPPFLAGS = \
-I$(top_builddir)/headers \ -I$(top_builddir)/headers \
$(GLOBAL_CPPFLAGS) \ $(GLOBAL_CPPFLAGS) \
$(PCRE_CFLAGS) \ $(PCRE_CFLAGS) \
$(PCRE2_CFLAGS) \
$(LMDB_CFLAGS) \ $(LMDB_CFLAGS) \
$(MAXMIND_CFLAGS) \ $(MAXMIND_CFLAGS) \
$(LIBXML2_CFLAGS) $(LIBXML2_CFLAGS)