diff options
| -rw-r--r-- | net/glusterfs/files/patch-configure.ac | 20 | ||||
| -rw-r--r-- | net/glusterfs/files/patch-libglusterfs_src_Makefile.am | 11 |
2 files changed, 29 insertions, 2 deletions
diff --git a/net/glusterfs/files/patch-configure.ac b/net/glusterfs/files/patch-configure.ac index 6d385aa7902e..97d2dfe68826 100644 --- a/net/glusterfs/files/patch-configure.ac +++ b/net/glusterfs/files/patch-configure.ac @@ -1,6 +1,22 @@ --- configure.ac.orig 2020-07-06 01:22:37 UTC +++ configure.ac -@@ -731,6 +731,9 @@ AC_ARG_ENABLE([georeplication], +@@ -351,7 +351,14 @@ if test "x$ac_cv_file__etc_centos_release" = "xyes"; t + fi + + dnl On some distributions '-ldl' isn't automatically added to LIBS +-AC_CHECK_LIB([dl], [dlopen], [LIB_DL=-ldl]) ++case $host_os in ++ *freebsd*) ++ #do nothing ++ ;; ++ *) ++ AC_CHECK_LIB([dl], [dlopen], [LIB_DL=-ldl]) ++ ;; ++esac + AC_SUBST(LIB_DL) + + AC_ARG_ENABLE([privport_tracking], +@@ -731,6 +738,9 @@ AC_ARG_ENABLE([georeplication], BUILD_SYNCDAEMON=no case $host_os in @@ -10,7 +26,7 @@ linux*) #do nothing ;; -@@ -1207,10 +1210,6 @@ case $host_os in +@@ -1207,10 +1217,6 @@ case $host_os in ;; *freebsd*) GF_HOST_OS="GF_BSD_HOST_OS" diff --git a/net/glusterfs/files/patch-libglusterfs_src_Makefile.am b/net/glusterfs/files/patch-libglusterfs_src_Makefile.am new file mode 100644 index 000000000000..c7eb733dbafe --- /dev/null +++ b/net/glusterfs/files/patch-libglusterfs_src_Makefile.am @@ -0,0 +1,11 @@ +--- libglusterfs/src/Makefile.am.orig 2020-07-06 01:22:37 UTC ++++ libglusterfs/src/Makefile.am +@@ -12,7 +12,7 @@ libglusterfs_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE + -DSBIN_DIR=\"$(sbindir)\" -I$(CONTRIBDIR)/timer-wheel \ + -I$(CONTRIBDIR)/xxhash + +-libglusterfs_la_LIBADD = $(ZLIB_LIBS) $(MATH_LIB) $(UUID_LIBS) ++libglusterfs_la_LIBADD = $(ZLIB_LIBS) $(MATH_LIB) $(UUID_LIBS) $(URCU_LIBS) + libglusterfs_la_LDFLAGS = -version-info $(LIBGLUSTERFS_LT_VERSION) $(GF_LDFLAGS) \ + -export-symbols $(top_srcdir)/libglusterfs/src/libglusterfs.sym + |