From owner-svn-ports-head@freebsd.org Mon Aug 10 03:28:08 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D5C0F3C4580; Mon, 10 Aug 2020 03:28:08 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BQ1d45M6rz4g7R; Mon, 10 Aug 2020 03:28:08 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9BCFE23D97; Mon, 10 Aug 2020 03:28:08 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07A3S8hQ031192; Mon, 10 Aug 2020 03:28:08 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07A3S8xL031190; Mon, 10 Aug 2020 03:28:08 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <202008100328.07A3S8xL031190@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Mon, 10 Aug 2020 03:28:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r544584 - head/net/glusterfs/files X-SVN-Group: ports-head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: head/net/glusterfs/files X-SVN-Commit-Revision: 544584 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Aug 2020 03:28:08 -0000 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 (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 +