[build] updates for arm64

aminclude_static.am

@@ -1,6 +1,6 @@
 
 # aminclude_static.am generated automatically by Autoconf
-# from AX_AM_MACROS_STATIC on Fri Jul 15 10:37:15 PDT 2022
+# from AX_AM_MACROS_STATIC on Thu Jul 28 15:04:20 PDT 2022
 
 
 # Code coverage

conanfile.py

@@ -23,7 +23,7 @@ class LnavConan(ConanFile):
         "pcre/8.45",
         "readline/8.1.2",
         "sqlite3/3.38.0",
-        "zlib/1.2.11",
+        "zlib/1.2.12",
     )
     generators = ("virtualrunenv",)
     default_options = {
@@ -45,6 +45,8 @@ class LnavConan(ConanFile):
     def build(self):
         cmake = CMake(self)
         cmake.configure()
+        if self.settings.os == "Macos" and self.settings.arch == "armv8":
+            cmake.definitions["CMAKE_SYSTEM_PROCESSOR"] = "arm64"
         cmake.build()
 
     def package(self):

m4/lnav_with_pcre.m4

@@ -38,18 +38,19 @@ if test ".$with_pcre" = ".no" ; then
   m4_ifval($2,$2)
 else
   AC_MSG_RESULT([(testing)])
-  AC_CHECK_LIB(pcre, pcre_study)
   AS_VAR_SET(saved_LIBS, $LIBS)
-  AC_CHECK_HEADERS(pcre.h pcre/pcre.h)
-  if test "$ac_cv_lib_pcre_pcre_study" = "yes" ; then
+  if test ".$with_pcre" = "." && test "$ac_cv_lib_pcre_pcre_study" = "yes" ; then
      PCRE_LIBS="-lpcre"
      AC_MSG_CHECKING([lib pcre])
+     AC_CHECK_LIB(pcre, pcre_study)
+     AC_CHECK_HEADERS(pcre.h pcre/pcre.h)
      AC_MSG_RESULT([$PCRE_LIBS])
      m4_ifval($1,$1)
   else
      OLDLDFLAGS="$LDFLAGS" ; LDFLAGS="$LDFLAGS -L$with_pcre/lib"
      OLDCPPFLAGS="$CPPFLAGS" ; CPPFLAGS="$CPPFLAGS -I$with_pcre/include"
      AC_CHECK_LIB(pcre, pcre_compile)
+     AC_CHECK_HEADERS(pcre.h pcre/pcre.h)
      CPPFLAGS="$OLDCPPFLAGS"
      LDFLAGS="$OLDLDFLAGS"
      if test "$ac_cv_lib_pcre_pcre_compile" = "yes" ; then

src/Makefile.am

@@ -116,6 +116,7 @@ AM_CPPFLAGS = \
 	$(LIBARCHIVE_CFLAGS) \
 	$(READLINE_CFLAGS) \
 	$(SQLITE3_CFLAGS) \
+	$(PCRE_CFLAGS) \
 	$(LIBCURL_CPPFLAGS)
 
 LDADD = \

src/base/CMakeLists.txt

@@ -58,9 +58,7 @@ add_library(
         time_util.hh
 
         ../third-party/xxHash/xxhash.h
-        ../third-party/xxHash/xxh_x86dispatch.h
         ../third-party/xxHash/xxhash.c
-        ../third-party/xxHash/xxh_x86dispatch.c
 )
 
 target_include_directories(base PUBLIC . .. ../fmtlib ../third-party

src/base/Makefile.am

@@ -10,6 +10,7 @@ AM_CPPFLAGS = \
     $(LIBARCHIVE_CFLAGS) \
     $(READLINE_CFLAGS) \
     $(SQLITE3_CFLAGS) \
+    $(PCRE_CFLAGS) \
     $(LIBCURL_CPPFLAGS)
 
 AM_LIBS = $(CODE_COVERAGE_LIBS)

src/pcrepp/Makefile.am

@@ -3,6 +3,7 @@ include $(top_srcdir)/aminclude_static.am
 
 AM_CPPFLAGS = \
 	$(CODE_COVERAGE_CPPFLAGS) \
+	$(PCRE_CFLAGS) \
 	-Wall \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/fmtlib

src/tailer/Makefile.am

@@ -12,6 +12,7 @@ AM_CPPFLAGS = \
 	$(LIBARCHIVE_CFLAGS) \
 	$(READLINE_CFLAGS) \
 	$(SQLITE3_CFLAGS) \
+	$(PCRE_CFLAGS) \
 	$(LIBCURL_CPPFLAGS)
 
 AM_LIBS = $(CODE_COVERAGE_LIBS)

src/yajlpp/Makefile.am

@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
 	$(CODE_COVERAGE_CPPFLAGS) \
     -Wall \
 	$(LIBARCHIVE_CFLAGS) \
+	$(PCRE_CFLAGS) \
     -I$(top_srcdir)/src/ \
     -I$(top_srcdir)/src/fmtlib
 

test/Makefile.am

@@ -20,6 +20,7 @@ AM_CPPFLAGS = \
 	$(CODE_COVERAGE_CPPFLAGS) \
 	$(LIBARCHIVE_CFLAGS) \
 	$(READLINE_CFLAGS) \
+	$(PCRE_CFLAGS) \
 	$(SQLITE3_CFLAGS)
 
 # AM_CFLAGS = -fprofile-arcs -ftest-coverage