Merge pull request syslog-ng#5109 from HofiOne/cmake-should-use-the-same-cxx-version

Further macOS CXX and CI build updates

Author: HofiOne

.github/workflows/devshell.yml

@@ -54,7 +54,7 @@ jobs:
           CMAKE_FLAGS="
             -DCMAKE_BUILD_TYPE=Debug
             -DCMAKE_C_FLAGS=-Werror
-            -DCMAKE_INSTALL_PREFIX=${HOME}/install/syslog-ng
+            -DCMAKE_INSTALL_PREFIX=${SYSLOG_NG_INSTALL_DIR}
             -DPYTHON_VERSION=3
           "
           gh_export COREFILES_DIR PYTHONUSERBASE CC CXX SYSLOG_NG_INSTALL_DIR CONFIGURE_FLAGS CMAKE_FLAGS
@@ -89,7 +89,9 @@ jobs:
 
       - name: make install
         working-directory: ./build
-        run: make install
+        run: |
+          make install
+          "${SYSLOG_NG_INSTALL_DIR}/sbin/syslog-ng" -V
 
       - name: Python virtualenv for syslog-ng runtime
         run: ${SYSLOG_NG_INSTALL_DIR}/bin/syslog-ng-update-virtualenv -y

.github/workflows/macos.yml

@@ -10,9 +10,15 @@ jobs:
   general:
     strategy:
       matrix:
+        # https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners
+        # 13 - X86_64
+        # 14 or latest - Arm64 M1
         version: [13, 14]
         build-tool: [ autotools, cmake ]
         compiler: [ {cpp: clang++, c: clang}, {cpp: g++, c: gcc} ]
+        exclude:
+          - version: 14
+            compiler: {cpp: clang++, c: clang}
       fail-fast: false
 
     runs-on: macOS-${{ matrix.version }}
@@ -39,6 +45,13 @@ jobs:
           brew update --preinstall
           brew bundle --file=contrib/Brewfile
 
+          OS_NAME=$([[ ${{ matrix.version }} -eq 13 ]] && echo "Ventura" || echo "Sonoma")
+          MACPORTS_PKG_NAME=MacPorts-2.10.1-${{ matrix.version }}-${OS_NAME}.pkg
+          MACPORTS_URL=https://github.com/macports/macports-base/releases/download/v2.10.1/${MACPORTS_PKG_NAME}
+          wget ${MACPORTS_URL}
+          sudo installer -pkg ./${MACPORTS_PKG_NAME} -target /
+          sudo /opt/local/bin/port install libesmtp
+
       - name: Set ENV variables
         env:
           CC: ${{ matrix.compiler.c }}
@@ -48,22 +61,22 @@ jobs:
           . .github/workflows/gh-tools.sh
 
           HOMEBREW_PREFIX="$(brew --prefix)"
+          MACPORTS_PREFIX=/opt/local
+          SYSLOG_NG_INSTALL_DIR="${HOME}/install/syslog-ng"
           PYTHONUSERBASE="${HOME}/python_packages"
           THREADS="$(sysctl -n hw.physicalcpu)"
-          CFLAGS="-I${HOMEBREW_PREFIX}/include/"
-          LDFLAGS="-L${HOMEBREW_PREFIX}/lib"
+          CFLAGS="-I${HOMEBREW_PREFIX}/include/ -I${MACPORTS_PREFIX}/include"
+          LDFLAGS="-L${HOMEBREW_PREFIX}/lib -L${MACPORTS_PREFIX}/lib"
           CONFIGURE_FLAGS="
             --enable-force-gnu99
             --prefix=${SYSLOG_NG_INSTALL_DIR}
             --enable-all-modules
             --enable-tests
-            --with-ivykis=internal
+            --with-ivykis=system
             --with-python=3
             --with-systemd-journal=no
-            --disable-smtp
             --disable-java
             --disable-java-modules
-            --disable-pacct
           "
           CMAKE_CONFIGURE_FLAGS="
             -DCMAKE_BUILD_TYPE=Debug
@@ -72,16 +85,13 @@ jobs:
             -DIVYKIS_SOURCE=internal
             -DPYTHON_VERSION=3
             -DENABLE_JOURNALD=OFF
-            -DENABLE_AFSMTP=OFF
-            -DENABLE_GRPC=OFF
             -DENABLE_JAVA=OFF
             -DENABLE_JAVA_MODULES=OFF
-            -DENABLE_PACCT=OFF
           "
-          PKG_CONFIG_PATH="${HOMEBREW_PREFIX}/opt/openssl@3/lib/pkgconfig:${HOMEBREW_PREFIX}/opt/net-snmp/lib/pkgconfig:${HOMEBREW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}"
-          PATH="${HOMEBREW_PREFIX}/opt/bison/bin:${HOMEBREW_PREFIX}/opt/libnet/bin:${HOMEBREW_PREFIX}/opt/net-snmp/bin:${HOMEBREW_PREFIX}/bin:${HOMEBREW_PREFIX}/sbin:${PYTHONUSERBASE}/bin:${PATH}"
+          PKG_CONFIG_PATH="${HOMEBREW_PREFIX}/opt/openssl@3/lib/pkgconfig:${HOMEBREW_PREFIX}/opt/net-snmp/lib/pkgconfig:${HOMEBREW_PREFIX}/lib/pkgconfig:${MACPORTS_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}"
+          PATH="${HOMEBREW_PREFIX}/opt/bison/bin:${HOMEBREW_PREFIX}/opt/libnet/bin:${HOMEBREW_PREFIX}/opt/net-snmp/bin:${HOMEBREW_PREFIX}/bin:${HOMEBREW_PREFIX}/sbin:${PYTHONUSERBASE}/bin:${MACPORTS_PREFIX}/bin:${MACPORTS_PREFIX}/sbin:${PATH}"
 
-          gh_export HOMEBREW_PREFIX PYTHONUSERBASE CC CXX PKG_CONFIG_PATH THREADS CONFIGURE_FLAGS CFLAGS LDFLAGS CMAKE_CONFIGURE_FLAGS PATH
+          gh_export HOMEBREW_PREFIX MACPORTS_PREFIX SYSLOG_NG_INSTALL_DIR PYTHONUSERBASE CC CXX PKG_CONFIG_PATH THREADS CONFIGURE_FLAGS CFLAGS LDFLAGS CMAKE_CONFIGURE_FLAGS PATH
           gh_path "${PATH}"
 
           echo "ARCH: " $(arch)
@@ -101,36 +111,36 @@ jobs:
       - name: cmake configure
         if: matrix.build-tool == 'cmake'
         run: |
-          mkdir build
-
           # If you know the valid syntax to provide the quoted string for -DCMAKE_C_FLAGS inplace in CMAKE_CONFIGURE_FLAGS above (in Set ENV variables step) instead of this hack, please contribute!
           #
           # TODO: -Wall must be replaced here with -Werror but now multiple warnings could occure in several modules that needs to be corrected first
           #
-          cmake --install-prefix "${HOME}/install/syslog-ng" -B build . -DCMAKE_C_FLAGS="-Wall ${CFLAGS}" ${CMAKE_CONFIGURE_FLAGS}
+          cmake --install-prefix "${SYSLOG_NG_INSTALL_DIR}" -B build . -DCMAKE_C_FLAGS="-Wall ${CFLAGS}" ${CMAKE_CONFIGURE_FLAGS}
 
       - name: cmake install
         if: matrix.build-tool == 'cmake'
         run: |
           cmake --build ./build -j ${THREADS} --target install
+          "${SYSLOG_NG_INSTALL_DIR}/sbin/syslog-ng" -V
 
       - name: cmake check
         # FIXME: Some of our checks still do not run correctly on silicon yet (and probably never will)
         if: matrix.build-tool == 'cmake' && matrix.version != 14
         run: |
           cmake --build ./build -j ${THREADS} --target check
 
-      - name: make
+      - name: make install
         if: matrix.build-tool == 'autotools'
         run: |
           set -e
 
-          make --keep-going -j ${THREADS} || \
+          make --keep-going install -j ${THREADS} || \
             { \
               S=$?; \
               make V=1; \
               return $S; \
             }
+          "${SYSLOG_NG_INSTALL_DIR}/sbin/syslog-ng" -V
 
       - name: make check
         # FIXME: Some of our checks still do not run correctly on silicon yet (and probably never will)

CMakeLists.txt

@@ -16,18 +16,32 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 project(syslog-ng C)
 
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules ${PROJECT_SOURCE_DIR}/cmake/)
+set(CMAKE_POSITION_INDEPENDENT_CODE 1)
+set(BISON_FLAGS "-Wno-other -Werror=conflicts-sr -Werror=conflicts-rr -Wcounterexamples")
+set(BISON_BUILT_SOURCE_CFLAGS "-Wno-unused-but-set-variable")
+
+include(CheckIncludeFiles)
+include(CheckFunctionExists)
+include(ExternalProject)
+include(external_or_find_package)
+include(add_module)
+include(module_switch)
+include(FindGperf)
+
 option(ENABLE_CPP "Enable C++" ON)
 
 if (ENABLE_CPP)
   enable_language(CXX)
   set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard")
-  set(CMAKE_CXX_STANDARD_REQUIRED OFF CACHE BOOL "C++ standard is a requirement")
+  set(CMAKE_CXX_STANDARD_REQUIRED ON CACHE BOOL "C++ standard is a requirement")
   set(CMAKE_CXX_EXTENSIONS OFF CACHE BOOL "C++ compiler specific extensions")
   set(SYSLOG_NG_ENABLE_CPP ${ENABLE_CPP})
 endif()
 
 if(APPLE)
-  option(ENABLE_OBJC "Enable OSLog" ENABLE_DARWIN_OSL)
+  module_switch(ENABLE_DARWIN_OSL "Enable OSLog" ON)
+  option(ENABLE_OBJC "Enable ObjC" ${ENABLE_DARWIN_OSL})
 endif()
 
 if(ENABLE_OBJC)
@@ -39,19 +53,6 @@ if(ENABLE_OBJC)
   set_property(GLOBAL PROPERTY OBJC_STANDARD_REQUIRED ON)
 endif()
 
-set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules ${PROJECT_SOURCE_DIR}/cmake/)
-set(CMAKE_POSITION_INDEPENDENT_CODE 1)
-set(BISON_FLAGS "-Wno-other -Werror=conflicts-sr -Werror=conflicts-rr -Wcounterexamples")
-set(BISON_BUILT_SOURCE_CFLAGS "-Wno-unused-but-set-variable")
-
-include(CheckIncludeFiles)
-include(CheckFunctionExists)
-include(ExternalProject)
-include(external_or_find_package)
-include(add_module)
-include(module_switch)
-include(FindGperf)
-
 find_package(Git QUIET)
 if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
     option(GIT_SUBMODULE "Checkout submodules during build" ON)

configure.ac

@@ -506,11 +506,11 @@ dnl C++
 AC_PROG_CXX([$CPP_COMPILER])
 
 if test "x$enable_cpp" = "xyes"; then
-        AX_CXX_COMPILE_STDCXX(11,, mandatory)
+        AX_CXX_COMPILE_STDCXX(14,, mandatory)
         AX_CXX_COMPILE_STDCXX(17,, optional)
 elif test "x$enable_cpp" = "xauto"; then
-        AX_CXX_COMPILE_STDCXX(11,, optional)
-        if test "x$HAVE_CXX11" = "x1"; then
+        AX_CXX_COMPILE_STDCXX(14,, optional)
+        if test "x$HAVE_CXX14" = "x1"; then
                 enable_cpp=yes
         else
                 enable_cpp=no

contrib/Brewfile

@@ -3,21 +3,23 @@ brew "autoconf"
 brew "automake"
 brew "binutils"
 brew "bison"
+brew "cmake"
 brew "flex"
-brew "gcc@11"
+brew "gcc@14"
 brew "glib"
 brew "ivykis"
 brew "json-c"
 brew "libtool"
 brew "openssl@3"
-brew "pcre"
+brew "pcre2"
 brew "pkg-config"
 
 brew "curl"
 brew "gradle"
 brew "hiredis"
 brew "libdbi"
 brew "libmaxminddb"
+#brew "libesmtp" - noy yet available in brew
 brew "libnet"
 brew "libpaho-mqtt"
 brew "librdkafka"