Date: Mon, 10 Aug 2020 03:28:08 +0000 (UTC) From: Li-Wen Hsu <lwhsu@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r544584 - head/net/glusterfs/files Message-ID: <202008100328.07A3S8xL031190@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lwhsu Date: Mon Aug 10 03:28:07 2020 New Revision: 544584 URL: https://svnweb.freebsd.org/changeset/ports/544584 Log: Fix build on i386 PR: 248552 Submitted by: Daniel Morante <daniel@morante.net> (maintainer) Added: head/net/glusterfs/files/patch-libglusterfs_src_Makefile.am (contents, props changed) Modified: head/net/glusterfs/files/patch-configure.ac Modified: head/net/glusterfs/files/patch-configure.ac ============================================================================== --- head/net/glusterfs/files/patch-configure.ac Sun Aug 9 23:55:24 2020 (r544583) +++ head/net/glusterfs/files/patch-configure.ac Mon Aug 10 03:28:07 2020 (r544584) @@ -1,7 +1,23 @@ --- 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 + freebsd*) @@ -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" Added: head/net/glusterfs/files/patch-libglusterfs_src_Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/glusterfs/files/patch-libglusterfs_src_Makefile.am Mon Aug 10 03:28:07 2020 (r544584) @@ -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 +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008100328.07A3S8xL031190>