Merge pull request syslog-ng#5130 from HofiOne/further-werror-and-FreeBSD-fixes

HofiOne · web-flow · commit 92c3c38ae787 · 2024-09-25T16:22:12.000+02:00
CI: further -Werror and FreeBSD fixes
diff --git a/.github/workflows/devshell.yml b/.github/workflows/devshell.yml
@@ -55,7 +55,7 @@ jobs:
             --enable-ebpf
           "
           CMAKE_CONFIGURE_FLAGS="
-            -DCMAKE_C_FLAGS=-Werror
+            `[ $CC = clang ] && echo '-DENABLE_FORCE_GNU99=ON' || true`
             -DSUMMARY_VERBOSE=ON
             -DCMAKE_BUILD_TYPE=Debug
             -DCMAKE_INSTALL_PREFIX=${SYSLOG_NG_INSTALL_DIR}
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -435,22 +435,27 @@ if (ENABLE_EXTRA_WARNINGS)
     -Wfloat-conversion
     $<$<COMPILE_LANGUAGE:C>:-Wbad-function-cast>)
 
-if ("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
-  set(EXTRA_WARNINGS
-    ${EXTRA_WARNINGS}
-    )
-else()
-  set(EXTRA_WARNINGS
-    $<$<COMPILE_LANGUAGE:C>:-Wold-style-declaration>
-    -Wunused-but-set-parameter
-    $<$<COMPILE_LANGUAGE:C>:-Woverride-init>
-    ${EXTRA_WARNINGS}
-    )
+  if ("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
+    set(EXTRA_WARNINGS
+      ${EXTRA_WARNINGS}
+      )
+  else()
+    set(EXTRA_WARNINGS
+      $<$<COMPILE_LANGUAGE:C>:-Wold-style-declaration>
+      -Wunused-but-set-parameter
+      $<$<COMPILE_LANGUAGE:C>:-Woverride-init>
+      ${EXTRA_WARNINGS}
+      )
+  endif()
 endif()
 
-endif()
+add_compile_options (${IMPORTANT_WARNINGS} ${ACCEPTABLE_WARNINGS} ${EXTRA_WARNINGS})
 
-add_compile_options(${IMPORTANT_WARNINGS} ${ACCEPTABLE_WARNINGS} ${EXTRA_WARNINGS})
+option(ENABLE_FORCE_GNU99 "Enforce C99 with gnu extensions" OFF)
+if (ENABLE_FORCE_GNU99)
+  set(EXTRA_CFLAGS -std=gnu99)
+endif()
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
 
 # Sanatizer configuration
 set(SANITIZER "OFF" CACHE STRING "Enable clang sanitizer")
diff --git a/cmake/print_config_summary.cmake b/cmake/print_config_summary.cmake
@@ -33,7 +33,7 @@ set(_maxHeaderLen 39)
 list(APPEND _envInfo "CMAKE_HOST_SYSTEM" "CMAKE_HOST_SYSTEM_NAME" "CMAKE_HOST_SYSTEM_PROCESSOR" "CMAKE_HOST_SYSTEM_VERSION")
 list(APPEND _subModules "IVYKIS_SOURCE")
 list(APPEND _compilersInfo "CMAKE_C_COMPILER" "CMAKE_CXX_COMPILER" "CMAKE_OBJC_COMPILER")
-list(APPEND _compilationsOptions "CMAKE_BUILD_TYPE" "BUILD_TESTING" "ENABLE_EXTRA_WARNINGS")
+list(APPEND _compilationsOptions "CMAKE_BUILD_TYPE" "BUILD_TESTING" "ENABLE_EXTRA_WARNINGS" "ENABLE_FORCE_GNU99")
 if(APPLE)
   list(APPEND _compilationsOptions "FORCE_CLASSIC_LINKING")
 endif()
diff --git a/configure.ac b/configure.ac
@@ -2304,6 +2304,7 @@ AM_CONDITIONAL([HAVE_JAVAH], [test -n "$JAVAH_BIN"])
 AM_CONDITIONAL(ENABLE_IPV6, [test $enable_ipv6 = yes])
 
 AM_CONDITIONAL(OS_TYPE_MACOS, [test $ostype = "Darwin"])
+AM_CONDITIONAL(OS_TYPE_FREEBSD, [test $ostype = "FreeBSD"])
 
 AC_SUBST(PYTHON_VENV)
 AC_SUBST(PYTHON_VENV_DIR)
diff --git a/modules/grpc/CMakeLists.txt b/modules/grpc/CMakeLists.txt
@@ -58,6 +58,9 @@ endif()
 module_switch(ENABLE_GRPC "Enable GRPC" GRPC_DEPS_FOUND)
 
 if (ENABLE_GRPC)
+  set (CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard" FORCE)
+  set (CMAKE_CXX_STANDARD_REQUIRED ON CACHE BOOL "C++ standard is a requirement" FORCE)
+
   include(ProtobufGenerateCpp)
 
   set(MODULE_GRPC_LIBS
@@ -72,7 +75,7 @@ endif()
 
 # These are intentionally not inside the above if (ENABLE_GRPC) block
 # Let any other possible module_switch-es take effect and is being always visible
-# (both modules are protected via ENABLE_GRPC as well)
+# (all modules are protected via ENABLE_GRPC as well)
 add_subdirectory(loki)
 add_subdirectory(otel)
 add_subdirectory(bigquery)
diff --git a/modules/grpc/otel/tests/CMakeLists.txt b/modules/grpc/otel/tests/CMakeLists.txt
@@ -1,27 +1,29 @@
-add_unit_test(
-  CRITERION
-  TARGET test_otel_protobuf_parser
-  SOURCES test-otel-protobuf-parser.cpp
-  INCLUDES ${OTEL_PROTO_BUILDDIR}
-  DEPENDS otel-cpp)
+if (NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+  add_unit_test (
+    CRITERION
+    TARGET test_otel_protobuf_parser
+    SOURCES test-otel-protobuf-parser.cpp
+    INCLUDES ${OTEL_PROTO_BUILDDIR}
+    DEPENDS otel-cpp)
 
-add_unit_test(
-  CRITERION
-  TARGET test_otel_protobuf_formatter
-  SOURCES test-otel-protobuf-formatter.cpp
-  INCLUDES ${OTEL_PROTO_BUILDDIR}
-  DEPENDS otel-cpp)
+  add_unit_test (
+    CRITERION
+    TARGET test_otel_protobuf_formatter
+    SOURCES test-otel-protobuf-formatter.cpp
+    INCLUDES ${OTEL_PROTO_BUILDDIR}
+    DEPENDS otel-cpp)
 
-add_unit_test(
-  CRITERION
-  TARGET test_syslog_ng_otlp
-  SOURCES test-syslog-ng-otlp.cpp
-  INCLUDES ${OTEL_PROTO_BUILDDIR}
-  DEPENDS otel-cpp)
+  add_unit_test (
+    CRITERION
+    TARGET test_syslog_ng_otlp
+    SOURCES test-syslog-ng-otlp.cpp
+    INCLUDES ${OTEL_PROTO_BUILDDIR}
+    DEPENDS otel-cpp)
 
-add_unit_test(
-  CRITERION
-  TARGET test_otel_filterx
-  SOURCES test-otel-filterx.cpp
-  INCLUDES ${OTEL_PROTO_BUILDDIR}
-  DEPENDS otel-cpp otel_filterx_logrecord_cpp)
+  add_unit_test (
+    CRITERION
+    TARGET test_otel_filterx
+    SOURCES test-otel-filterx.cpp
+    INCLUDES ${OTEL_PROTO_BUILDDIR}
+    DEPENDS otel-cpp otel_filterx_logrecord_cpp)
+endif ()
diff --git a/modules/grpc/otel/tests/Makefile.am b/modules/grpc/otel/tests/Makefile.am
@@ -1,5 +1,6 @@
 if ENABLE_GRPC
 
+if ! OS_TYPE_FREEBSD
 if ! OS_TYPE_MACOS
 modules_grpc_otel_tests_TESTS = \
   modules/grpc/otel/tests/test_otel_protobuf_parser \
@@ -9,6 +10,7 @@ modules_grpc_otel_tests_TESTS = \
 
 check_PROGRAMS += ${modules_grpc_otel_tests_TESTS}
 endif
+endif
 
 modules_grpc_otel_tests_test_otel_protobuf_parser_SOURCES = \
   modules/grpc/otel/tests/test-otel-protobuf-parser.cpp
diff --git a/modules/grpc/protos/Makefile.am b/modules/grpc/protos/Makefile.am
@@ -146,4 +146,5 @@ endif
 EXTRA_DIST += \
   $(OPENTELEMETRY_PROTO_SRCDIR) \
   $(LOKI_PROTO_SRCDIR) \
+  $(GRPC_PROTOS_SRCDIR)/CMakeLists.txt \
   $(GOOGLEAPIS_PROTO_SRCDIR)
diff --git a/modules/java-modules/common/build.gradle b/modules/java-modules/common/build.gradle
@@ -15,6 +15,8 @@ dependencies {
   testImplementation 'org.hamcrest:hamcrest-core:1.3'
 }
 
+configurations.default.setCanBeResolved(true)
+
 ext.jarDestDir = project.hasProperty('jarDestDir') ? project.getProperty('jarDestDir') : '/'
 task copyLog4j(type: Copy) {
      from findJar('log4j-core')
diff --git a/modules/java/Makefile.am b/modules/java/Makefile.am
@@ -148,7 +148,8 @@ EXTRA_DIST += \
     modules/java/native/java-grammar.ym \
     modules/java/CMakeLists.txt	\
     modules/java/tools/syslog-ng.conf.example	\
-    $(patsubst %, $(SYSLOG_NG_CORE_SRC_DIR)/%, $(JAVA_FILES))
+    $(patsubst %, $(SYSLOG_NG_CORE_SRC_DIR)/%, $(JAVA_FILES))	\
+    cmake/syslog_ng_core_java_native.cmake
 
 .SECONDEXPANSION:
 
diff --git a/syslog-ng-config.h.in b/syslog-ng-config.h.in
@@ -108,3 +108,4 @@
 #cmakedefine01 SYSLOG_NG_HAVE_SO_MEMINFO
 #cmakedefine01 SYSLOG_NG_ENABLE_AFSOCKET_MEMINFO_METRICS
 #cmakedefine01 SYSLOG_NG_HAVE_IV_WORK_POOL_SUBMIT_CONTINUATION
+#cmakedefine01 SYSLOG_NG_HAVE_DECL_CURLUE_LAST

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ jobs:`
`55`	`55`	`--enable-ebpf`
`56`	`56`	`"`
`57`	`57`	`CMAKE_CONFIGURE_FLAGS="`
`58`		`- -DCMAKE_C_FLAGS=-Werror`
	`58`	+ `[ $CC = clang ] && echo '-DENABLE_FORCE_GNU99=ON' \|\| true`
`59`	`59`	`-DSUMMARY_VERBOSE=ON`
`60`	`60`	`-DCMAKE_BUILD_TYPE=Debug`
`61`	`61`	`-DCMAKE_INSTALL_PREFIX=${SYSLOG_NG_INSTALL_DIR}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@ dependencies {`
`15`	`15`	`testImplementation 'org.hamcrest:hamcrest-core:1.3'`
`16`	`16`	`}`
`17`	`17`
	`18`	`+configurations.default.setCanBeResolved(true)`
	`19`	`+`
`18`	`20`	`ext.jarDestDir = project.hasProperty('jarDestDir') ? project.getProperty('jarDestDir') : '/'`
`19`	`21`	`task copyLog4j(type: Copy) {`
`20`	`22`	`from findJar('log4j-core')`