Merge pull request syslog-ng#5142 from HofiOne/add-cmake-grpc-build-fix

Add cmake grpc build fix

Author: HofiOne

.github/workflows/macos.yml

@@ -81,6 +81,7 @@ jobs:
             --disable-java-modules
           "
           CMAKE_CONFIGURE_FLAGS="
+            `[ $CC = clang ] && echo '-DENABLE_FORCE_GNU99=ON' || true`
             -DSUMMARY_VERBOSE=ON
             -DCMAKE_BUILD_TYPE=Debug
             -DCMAKE_INSTALL_PREFIX=${SYSLOG_NG_INSTALL_DIR}
@@ -90,7 +91,6 @@ jobs:
             -DENABLE_JOURNALD=OFF
             -DENABLE_JAVA=OFF
             -DENABLE_JAVA_MODULES=OFF
-            -DENABLE_GRPC=OFF
           "
           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}"

modules/grpc/CMakeLists.txt

@@ -41,6 +41,21 @@ if (NOT DEFINED ENABLE_GRPC OR ENABLE_GRPC)
   endif()
 
   if (GRPC_DEPS_FOUND)
+    # Workaround of https://github.com/protocolbuffers/protobuf/issues/18307
+    # The latest (BSD variants) protobuf builds are forcibly bound to libupd, so
+    # find_package(gRPC...) will fail with
+    #     Targets not yet defined: protobuf::libupb, protobuf::protoc-gen-upb,
+    #     protobuf::protoc-gen-upbdefs, protobuf::protoc-gen-upb_minitable
+    # Try to satisfy it temporally.
+    #
+    find_library (UPB_LIBRARIES NAMES upb)
+    if (UPB_LIBRARIES)
+      add_library(protobuf::libupb STATIC IMPORTED)
+      add_executable(protobuf::protoc-gen-upb IMPORTED)
+      add_executable(protobuf::protoc-gen-upbdefs IMPORTED)
+      add_executable(protobuf::protoc-gen-upb_minitable IMPORTED)
+    endif()
+
     find_package(gRPC 1.16.1 QUIET)
 
     if (NOT gRPC_FOUND)