[FreeBSD] Fix for libinotify support and compile (#33607)

Resolves mono/mono#18528 in for both detection and compiling. This should backport cleanly to next release.

Tested on 12.1-RELEASE with libinotify; configure detects features correctly, compiles successfully, resolves some observed issues during run.

```
#define HAVE_SYS_INOTIFY_H 1
#define HAVE_LIBINOTIFY 1
#define HAVE_INOTIFY_INIT 1
#define HAVE_INOTIFY_ADD_WATCH 1
#define HAVE_INOTIFY_RM_WATCH 1
#define HAVE_INOTIFY 1
```

Co-authored-by: rootwyrm <rootwyrm@users.noreply.github.com>

diff --git a/src/mono/configure.ac b/src/mono/configure.ac
index e684552..fd2d543 100644 (file)
--- a/src/mono/configure.ac
+++ b/src/mono/configure.ac
@@ -2372,14 +2372,6 @@ if test x$host_win32 = xno; then
        dnl *****************************
        AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket")
 
-       case "$host" in
-               *-*-*freebsd*)
-                       dnl *****************************
-                       dnl *** Checks for libinotify ***
-                       dnl *****************************
-                       AC_CHECK_LIB(inotify, inotify_init, LIBS="$LIBS -linotify")
-       esac
-
        dnl *****************************
        dnl *** Checks for IPPROTO_IP ***
        dnl *****************************
@@ -3648,6 +3640,35 @@ if test x$host_win32 = xno; then
                AC_MSG_RESULT(no)
        ])
 
+       case "$host" in
+               *-*-*freebsd*)
+                       dnl *****************************
+                       dnl *** Checks for libinotify ***
+                       dnl *****************************
+                       AC_CHECK_LIB(inotify, inotify_init, LIBS="$LIBS -linotify")
+                       if test "x$ac_cv_lib_inotify_inotify_init" = "xyes" ; then
+                               AC_DEFINE(HAVE_LIBINOTIFY, 1, [FreeBSD libinotify kqueue shim])
+                               dnl Needs to be done this way to avoid collision with various 
+                               dnl ports including glib and llvm*
+                               METADATA_CFLAGS="-I/usr/local/include"
+                               AC_SUBST(METADATA_CFLAGS)
+                       fi
+                       dnl Workaround due to inotify_rm_watch check failing without -I
+                       AC_MSG_CHECKING(for inotify_rm_watch with unsigned wd in libinotify)
+                       AC_TRY_LINK([
+                               #include </usr/local/include/sys/inotify.h>
+                       ], [
+                               intptr_t fd;
+                               uint32_t wd;
+                               int result = inotify_rm_watch(fd, wd);
+                       ],[
+                          AC_MSG_RESULT(yes)
+                          AC_DEFINE(INOTIFY_RM_WATCH_WD_UNSIGNED, 1, [inotify_rm_watch with unsigned wd])
+                       ], [
+                               AC_MSG_RESULT(no)
+                       ])
+       esac
+
        CFLAGS="$ORIG_CFLAGS"
 
        AC_MSG_CHECKING(for shm_open that works well enough with mmap)
@@ -6565,7 +6586,7 @@ elif case $host_os in freebsd*) true;; *) false;; esac; then
        MONO_NATIVE_CXX=$CXX
        MONO_NATIVE_CPPFLAGS=$CPPFLAGS
        MONO_NATIVE_CXXFLAGS=$CXXFLAGS
-       MONO_NATIVE_CFLAGS=$CFLAGS
+       MONO_NATIVE_CFLAGS="$CFLAGS -I/usr/local/include"
        MONO_NATIVE_LDFLAGS=$LDFLAGS
 
        mono_native=yes

diff --git a/src/mono/mono/metadata/Makefile.am b/src/mono/mono/metadata/Makefile.am
index dc9cf2a..f8bb45d 100644 (file)
--- a/src/mono/mono/metadata/Makefile.am
+++ b/src/mono/mono/metadata/Makefile.am
@@ -107,7 +107,7 @@ noinst_LTLIBRARIES = libmonoruntime-config.la $(support_libraries) $(boehm_libra
 
 lib_LTLIBRARIES = $(icall_table_libraries) $(ilgen_libraries)
 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CPPFLAGS) $(GLIB_CFLAGS) $(SHARED_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CPPFLAGS) $(GLIB_CFLAGS) $(SHARED_CFLAGS) $(METADATA_CFLAGS)
 
 #
 # Make sure any prefix changes are updated in the binaries too.