From 6eb27480b6559103e4437facd7aecbcd373479c9 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Fri, 3 Apr 2015 18:14:13 +0200 Subject: build: make contrib/uuid dependency optional On Linux systems we should use the libuuid from the distribution and not bundle and statically link the contrib/uuid/ bits. libglusterfs/src/compat-uuid.h has been introduced and should become an abstraction layer for different UUID APIs. Non-Linux operating systems should implement their compatibility layer there. Once all operating systems have an implementation in compat-uuid.h, we can remove contrib/uuid/ from the repository completely. Change-Id: I345e5357644be2521685e00358bb8c83c4ea0577 BUG: 1206587 Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/10129 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- xlators/features/changelog/lib/src/Makefile.am | 12 ++---------- xlators/features/changelog/lib/src/gf-changelog-api.c | 2 +- .../changelog/lib/src/gf-changelog-journal-handler.c | 2 +- xlators/features/marker/src/marker.h | 2 +- xlators/mgmt/glusterd/src/Makefile.am | 2 +- xlators/mgmt/glusterd/src/glusterd-op-sm.c | 2 +- xlators/mgmt/glusterd/src/glusterd-op-sm.h | 2 +- xlators/mgmt/glusterd/src/glusterd-pmap.h | 2 +- xlators/mgmt/glusterd/src/glusterd-sm.c | 2 +- xlators/mgmt/glusterd/src/glusterd-sm.h | 2 +- xlators/mgmt/glusterd/src/glusterd-store.h | 2 +- xlators/mgmt/glusterd/src/glusterd-utils.h | 2 +- xlators/mgmt/glusterd/src/glusterd.c | 2 +- xlators/mgmt/glusterd/src/glusterd.h | 2 +- xlators/mount/fuse/src/Makefile.am | 2 +- xlators/nfs/server/src/mount3.h | 2 +- xlators/nfs/server/src/nfs-common.h | 2 +- xlators/nfs/server/src/nfs3-fh.h | 2 +- xlators/nfs/server/src/nlm4.h | 2 +- 19 files changed, 20 insertions(+), 28 deletions(-) (limited to 'xlators') diff --git a/xlators/features/changelog/lib/src/Makefile.am b/xlators/features/changelog/lib/src/Makefile.am index 456e211b89d..7da4f7c78ae 100644 --- a/xlators/features/changelog/lib/src/Makefile.am +++ b/xlators/features/changelog/lib/src/Makefile.am @@ -21,19 +21,11 @@ CONTRIB_BUILDDIR = $(top_builddir)/contrib libgfchangelog_la_SOURCES = gf-changelog.c gf-changelog-journal-handler.c gf-changelog-helpers.c \ gf-changelog-api.c gf-history-changelog.c gf-changelog-rpc.c gf-changelog-reborp.c \ - $(top_srcdir)/xlators/features/changelog/src/changelog-rpc-common.c \ - $(CONTRIBDIR)/uuid/clear.c $(CONTRIBDIR)/uuid/copy.c \ - $(CONTRIBDIR)/uuid/gen_uuid.c $(CONTRIBDIR)/uuid/pack.c \ - $(CONTRIBDIR)/uuid/parse.c $(CONTRIBDIR)/uuid/unparse.c \ - $(CONTRIBDIR)/uuid/uuid_time.c $(CONTRIBDIR)/uuid/compare.c \ - $(CONTRIBDIR)/uuid/isnull.c $(CONTRIBDIR)/uuid/unpack.c + $(top_srcdir)/xlators/features/changelog/src/changelog-rpc-common.c -noinst_HEADERS = gf-changelog-helpers.h gf-changelog-rpc.h gf-changelog-journal.h \ - $(CONTRIBDIR)/uuid/uuidd.h $(CONTRIBDIR)/uuid/uuid.h \ - $(CONTRIBDIR)/uuid/uuidP.h $(CONTRIB_BUILDDIR)/uuid/uuid_types.h +noinst_HEADERS = gf-changelog-helpers.h gf-changelog-rpc.h gf-changelog-journal.h CLEANFILES = -CONFIG_CLEAN_FILES = $(CONTRIB_BUILDDIR)/uuid/uuid_types.h $(top_builddir)/libglusterfs/src/libglusterfs.la: $(MAKE) -C $(top_builddir)/libglusterfs/src/ all diff --git a/xlators/features/changelog/lib/src/gf-changelog-api.c b/xlators/features/changelog/lib/src/gf-changelog-api.c index cea2ff01988..eee3ad1eefd 100644 --- a/xlators/features/changelog/lib/src/gf-changelog-api.c +++ b/xlators/features/changelog/lib/src/gf-changelog-api.c @@ -8,7 +8,7 @@ cases as published by the Free Software Foundation. */ -#include "uuid.h" +#include "compat-uuid.h" #include "globals.h" #include "glusterfs.h" diff --git a/xlators/features/changelog/lib/src/gf-changelog-journal-handler.c b/xlators/features/changelog/lib/src/gf-changelog-journal-handler.c index c4e14708b5f..4029a562dfa 100644 --- a/xlators/features/changelog/lib/src/gf-changelog-journal-handler.c +++ b/xlators/features/changelog/lib/src/gf-changelog-journal-handler.c @@ -8,7 +8,7 @@ cases as published by the Free Software Foundation. */ -#include "uuid.h" +#include "compat-uuid.h" #include "globals.h" #include "glusterfs.h" diff --git a/xlators/features/marker/src/marker.h b/xlators/features/marker/src/marker.h index 23d1580f0e5..b2d58d23f6c 100644 --- a/xlators/features/marker/src/marker.h +++ b/xlators/features/marker/src/marker.h @@ -18,7 +18,7 @@ #include "marker-quota.h" #include "xlator.h" #include "defaults.h" -#include "uuid.h" +#include "compat-uuid.h" #include "call-stub.h" #define MARKER_XATTR_PREFIX "trusted.glusterfs" diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am index 6ca0bf5960f..4793f31a034 100644 --- a/xlators/mgmt/glusterd/src/Makefile.am +++ b/xlators/mgmt/glusterd/src/Makefile.am @@ -43,7 +43,7 @@ noinst_HEADERS = glusterd.h glusterd-utils.h glusterd-op-sm.h \ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ -I$(rpclibdir) -I$(CONTRIBDIR)/rbtree \ -I$(top_srcdir)/rpc/xdr/src -I$(top_srcdir)/rpc/rpc-lib/src \ - -I$(CONTRIBDIR)/uuid -I$(CONTRIBDIR)/mount \ + -I$(CONTRIBDIR)/mount \ -I$(CONTRIBDIR)/userspace-rcu \ -DSBIN_DIR=\"$(sbindir)\" -DDATADIR=\"$(localstatedir)\" \ -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\" \ diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index 75943267e90..d7694258301 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -18,7 +18,7 @@ #include #include -#include "uuid.h" +#include "compat-uuid.h" #include "fnmatch.h" #include "xlator.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.h b/xlators/mgmt/glusterd/src/glusterd-op-sm.h index abfed02027e..69bfd4c92a5 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.h +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.h @@ -17,7 +17,7 @@ #include -#include "uuid.h" +#include "compat-uuid.h" #include "glusterfs.h" #include "xlator.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-pmap.h b/xlators/mgmt/glusterd/src/glusterd-pmap.h index 6336ee998fd..47434390303 100644 --- a/xlators/mgmt/glusterd/src/glusterd-pmap.h +++ b/xlators/mgmt/glusterd/src/glusterd-pmap.h @@ -16,7 +16,7 @@ #endif #include -#include "uuid.h" +#include "compat-uuid.h" #include "glusterfs.h" #include "xlator.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-sm.c b/xlators/mgmt/glusterd/src/glusterd-sm.c index 2ea473aeb16..f8228b0ab83 100644 --- a/xlators/mgmt/glusterd/src/glusterd-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-sm.c @@ -17,7 +17,7 @@ #include #include -#include "uuid.h" +#include "compat-uuid.h" #include "fnmatch.h" #include "xlator.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-sm.h b/xlators/mgmt/glusterd/src/glusterd-sm.h index 42fcaf87a32..be137802a64 100644 --- a/xlators/mgmt/glusterd/src/glusterd-sm.h +++ b/xlators/mgmt/glusterd/src/glusterd-sm.h @@ -16,7 +16,7 @@ #endif #include -#include "uuid.h" +#include "compat-uuid.h" #include "rpc-clnt.h" #include "glusterfs.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-store.h b/xlators/mgmt/glusterd/src/glusterd-store.h index 45ed86a4163..72fdd851d23 100644 --- a/xlators/mgmt/glusterd/src/glusterd-store.h +++ b/xlators/mgmt/glusterd/src/glusterd-store.h @@ -16,7 +16,7 @@ #endif #include -#include "uuid.h" +#include "compat-uuid.h" #include "glusterfs.h" #include "xlator.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.h b/xlators/mgmt/glusterd/src/glusterd-utils.h index abe687eb89c..80c7c19d508 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.h +++ b/xlators/mgmt/glusterd/src/glusterd-utils.h @@ -16,7 +16,7 @@ #endif #include -#include "uuid.h" +#include "compat-uuid.h" #include "glusterfs.h" #include "xlator.h" diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c index 30461d39fad..6ffde511af4 100644 --- a/xlators/mgmt/glusterd/src/glusterd.c +++ b/xlators/mgmt/glusterd/src/glusterd.c @@ -18,7 +18,7 @@ #include #include -#include "uuid.h" +#include "compat-uuid.h" #include "glusterd.h" #include "rpcsvc.h" diff --git a/xlators/mgmt/glusterd/src/glusterd.h b/xlators/mgmt/glusterd/src/glusterd.h index 8f8af26acfe..480cfc66269 100644 --- a/xlators/mgmt/glusterd/src/glusterd.h +++ b/xlators/mgmt/glusterd/src/glusterd.h @@ -20,7 +20,7 @@ #include #include -#include "uuid.h" +#include "compat-uuid.h" #include "rpc-clnt.h" #include "glusterfs.h" diff --git a/xlators/mount/fuse/src/Makefile.am b/xlators/mount/fuse/src/Makefile.am index 7d1f93447bf..749fb3bbbb5 100644 --- a/xlators/mount/fuse/src/Makefile.am +++ b/xlators/mount/fuse/src/Makefile.am @@ -27,7 +27,7 @@ fuse_la_SOURCES = fuse-helpers.c fuse-resolve.c fuse-bridge.c \ $(CONTRIBDIR)/fuse-lib/misc.c $(mount_source) fuse_la_LDFLAGS = -module -avoid-version -fuse_la_LIBADD = @GF_FUSE_LDADD@ +fuse_la_LIBADD = $(GF_LDADD) @GF_FUSE_LDADD@ AM_CPPFLAGS = $(GF_CPPFLAGS) \ -I$(top_srcdir)/libglusterfs/src -I$(CONTRIBDIR)/fuse-include \ diff --git a/xlators/nfs/server/src/mount3.h b/xlators/nfs/server/src/mount3.h index 8ef9c62a655..026300e886f 100644 --- a/xlators/nfs/server/src/mount3.h +++ b/xlators/nfs/server/src/mount3.h @@ -25,7 +25,7 @@ #include "xdr-nfs3.h" #include "locking.h" #include "nfs3-fh.h" -#include "uuid.h" +#include "compat-uuid.h" #include "exports.h" #include "mount3-auth.h" #include "auth-cache.h" diff --git a/xlators/nfs/server/src/nfs-common.h b/xlators/nfs/server/src/nfs-common.h index 2e97f1563c9..401484c0f3c 100644 --- a/xlators/nfs/server/src/nfs-common.h +++ b/xlators/nfs/server/src/nfs-common.h @@ -21,7 +21,7 @@ #include "xlator.h" #include "rpcsvc.h" #include "iatt.h" -#include "uuid.h" +#include "compat-uuid.h" //NFS_PATH_MAX hard-coded to 4096 as a work around for bug 2476. //nfs server crashes when path received is longer than PATH_MAX diff --git a/xlators/nfs/server/src/nfs3-fh.h b/xlators/nfs/server/src/nfs3-fh.h index 3e64772af07..eb969e44e22 100644 --- a/xlators/nfs/server/src/nfs3-fh.h +++ b/xlators/nfs/server/src/nfs3-fh.h @@ -20,7 +20,7 @@ #include "xdr-nfs3.h" #include "iatt.h" #include -#include "uuid.h" +#include "compat-uuid.h" /* BIG FAT WARNING: The file handle code is tightly coupled to NFSv3 file * handles for now. This will change if and when we need v4. */ diff --git a/xlators/nfs/server/src/nlm4.h b/xlators/nfs/server/src/nlm4.h index 0ed05deb947..0ab03d8c575 100644 --- a/xlators/nfs/server/src/nlm4.h +++ b/xlators/nfs/server/src/nlm4.h @@ -27,7 +27,7 @@ #include "xdr-nfs3.h" #include "locking.h" #include "nfs3-fh.h" -#include "uuid.h" +#include "compat-uuid.h" #include "nlm4-xdr.h" #include "lkowner.h" -- cgit