diff --git a/.github/workflows/macos-build.yaml b/.github/workflows/macos-build.yaml index e28a03b..e66ca35 100644 --- a/.github/workflows/macos-build.yaml +++ b/.github/workflows/macos-build.yaml @@ -10,9 +10,12 @@ on: jobs: build: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: actions/checkout@v2 + - uses: actions/setup-python@v4 + with: + python-version: '3.9' - name: install deps run: | brew install rust pkg-config diff --git a/Makefile-macOS.brim b/Makefile-macOS.brim index 963d868..77173c1 100644 --- a/Makefile-macOS.brim +++ b/Makefile-macOS.brim @@ -2,6 +2,12 @@ include Makefile LIBS = -lpcap -lpthread -lz libmagic_version = $(shell brew list --versions libmagic | cut -d ' ' -f 2) +libjansson_version = $(shell brew list --versions jansson | cut -d ' ' -f 2) +libbzip2_version = $(shell brew list --versions bzip2 | cut -d ' ' -f 2) +liblz4_version = $(shell brew list --versions lz4 | cut -d ' ' -f 2) +libnet_version = $(shell brew list --versions libnet | cut -d ' ' -f 2) +libpcre_version = $(shell brew list --versions pcre | cut -d ' ' -f 2) +libyaml_version = $(shell brew list --versions libyaml | cut -d ' ' -f 2) nss_libs = /usr/local/opt/nss/lib/libnss.a /usr/local/opt/nss/lib/libpkcs12.a /usr/local/opt/nss/lib/libpkixchecker.a /usr/local/opt/nss/lib/libcrmf.a /usr/local/opt/nss/lib/libnssutil.a /usr/local/opt/nss/lib/libpkixpki.a /usr/local/opt/nss/lib/libnssckfw.a /usr/local/opt/nss/lib/libsoftokn.a /usr/local/opt/nss/lib/libpkixsystem.a /usr/local/opt/nss/lib/libpkixmodule.a /usr/local/opt/nss/lib/libcerthi.a /usr/local/opt/nss/lib/libnssdbm.a /usr/local/opt/nss/lib/libpkixresults.a /usr/local/opt/nss/lib/libpkixstore.a /usr/local/opt/nss/lib/libfreebl.a /usr/local/opt/nss/lib/libpkixcrlsel.a /usr/local/opt/nss/lib/libpk11wrap.a /usr/local/opt/nss/lib/libsmime.a /usr/local/opt/nss/lib/libcertdb.a /usr/local/opt/nss/lib/libsectool.a /usr/local/opt/nss/lib/libjar.a /usr/local/opt/nss/lib/libpkixparams.a /usr/local/opt/nss/lib/libdbm.a /usr/local/opt/nss/lib/libpkixutil.a /usr/local/opt/nss/lib/libnssdev.a /usr/local/opt/nss/lib/libpkcs7.a /usr/local/opt/nss/lib/libnssb.a /usr/local/opt/nss/lib/libcryptohi.a /usr/local/opt/nss/lib/libpkixtop.a /usr/local/opt/nss/lib/libnsspki.a /usr/local/opt/nss/lib/libpkixcertsel.a nspr_libs = /usr/local/opt/nspr/lib/libplc4.a /usr/local/opt/nspr/lib/libplds4.a /usr/local/opt/nspr/lib/libnspr4.a @@ -9,4 +15,4 @@ nspr_libs = /usr/local/opt/nspr/lib/libplc4.a /usr/local/opt/nspr/lib/libplds4.a suricata: $(suricata_OBJECTS) $(suricata_DEPENDENCIES) $(EXTRA_suricata_DEPENDENCIES) @rm -f suricata$(EXEEXT) - $(AM_V_CCLD)$(suricata_LINK) $(suricata_OBJECTS) $(suricata_LDADD) /usr/local/Cellar/jansson/2.14/lib/libjansson.a /usr/local/Cellar/bzip2/1.0.8/lib/libbz2.a /usr/local/Cellar/libmagic/$(libmagic_version)/lib/libmagic.a /usr/local/Cellar/lz4/1.9.3/lib/liblz4.a /usr/local/Cellar/libnet/1.2/lib/libnet.a $(nss_libs) $(nspr_libs) /usr/local/Cellar/pcre/8.45/lib/libpcre.a /usr/local/Cellar/libyaml/0.2.5/lib/libyaml.a $(LIBS) + $(AM_V_CCLD)$(suricata_LINK) $(suricata_OBJECTS) $(suricata_LDADD) /usr/local/Cellar/jansson/$(libjansson_version)/lib/libjansson.a /usr/local/Cellar/bzip2/$(libbzip2_version)/lib/libbz2.a /usr/local/Cellar/libmagic/$(libmagic_version)/lib/libmagic.a /usr/local/Cellar/lz4/$(liblz4_version)/lib/liblz4.a /usr/local/Cellar/libnet/$(libnet_version)/lib/libnet.a $(nss_libs) $(nspr_libs) /usr/local/Cellar/pcre/$(libpcre_version)/lib/libpcre.a /usr/local/Cellar/libyaml/$(libyaml_version)/lib/libyaml.a $(LIBS)