--- configure.orig 2018-09-21 19:47:02.000000000 +1000 +++ configure 2020-08-26 22:52:56.776288000 +1000 @@ -4863,7 +4863,7 @@ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message + # or remarks (even with ). So we grep stderr for any message # that says an option was ignored or not supported. # When given -MP, icc 7.0 and 7.1 complain thusly: # icc: Command line warning: ignoring option '-M'; no argument required @@ -6646,7 +6646,7 @@ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message + # or remarks (even with ). So we grep stderr for any message # that says an option was ignored or not supported. # When given -MP, icc 7.0 and 7.1 complain thusly: # icc: Command line warning: ignoring option '-M'; no argument required @@ -9384,7 +9384,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + bitrig* | darwin* | dragonfly* | bsdsunix* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -9792,13 +9792,13 @@ lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly*) +bsdsunix* | freebsd* | dragonfly*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_deplibs_check_method='file_magic (BSDSUniX|FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; @@ -14343,7 +14343,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) + bsdsunix* | freebsd* | dragonfly*) archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -15388,6 +15388,18 @@ shlibpath_var=LD_LIBRARY_PATH ;; +bsdsunix*) + objformat=elf + version_type=bsdsunix-$objformat + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + need_version=no + need_lib_prefix=no + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -17485,11 +17497,11 @@ ld_shlibs_CXX=no ;; - freebsd-elf*) + bsdsunix-elf* | freebsd-elf*) archive_cmds_need_lc_CXX=no ;; - freebsd* | dragonfly*) + bsdsunix* | freebsd* | dragonfly*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions ld_shlibs_CXX=yes @@ -18429,7 +18441,7 @@ ;; esac ;; - freebsd* | dragonfly*) + bsdsunix* | freebsd* | dragonfly*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -19353,6 +19365,18 @@ shlibpath_var=LD_LIBRARY_PATH ;; +bsdsunix*) + objformat=elf + version_type=bsdsunix-$objformat + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + need_version=no + need_lib_prefix=no + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -26184,7 +26208,7 @@ ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default" if test "x$ac_cv_header_sys_inotify_h" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_INOTIFY_H 1 + _ACEOF for ac_func in inotify_init1 @@ -26194,7 +26218,7 @@ cat >>confdefs.h <<_ACEOF #define HAVE_INOTIFY_INIT1 1 _ACEOF - inotify_support=yes + inotify_support=no else inotify_support=no fi @@ -27579,9 +27603,12 @@ *android*) G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" ;; - *-*-freebsd*|*-*-linux*) + *-*-linux*) G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-lpthread/`" ;; + *-*-bsdsunix|*-*-freebsd*) + LDFLAGS="$LDFLAGS -pthread" + ;; *) G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" ;; @@ -29660,10 +29687,10 @@ for flag in \ -Wall -Wstrict-prototypes -Wduplicated-branches \ - -Werror=declaration-after-statement \ - -Werror=missing-prototypes -Werror=implicit-function-declaration \ - -Werror=pointer-arith -Werror=init-self -Werror=format-security \ - -Werror=format=2 -Werror=missing-include-dirs; do + =declaration-after-statement \ + =missing-prototypes -Werror=implicit-function-declaration \ + =pointer-arith -Werror=init-self -Werror=format-security \ + =format=2 -Werror=missing-include-dirs; do { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag $flag in envvar CFLAGS" >&5 $as_echo_n "checking if $CC supports flag $flag in envvar CFLAGS... " >&6; } @@ -29671,7 +29698,7 @@ $as_echo_n "(cached) " >&6 else eval "cc_save_CFLAGS='${CFLAGS}'" - eval "CFLAGS='-Werror $flag'" + eval "CFLAGS=' $flag'" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int a = 0; int main(void) { return a; }