diff options
| author | Niels de Vos <ndevos@redhat.com> | 2015-04-03 18:14:13 +0200 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2015-04-10 11:39:52 +0000 |
| commit | 6eb27480b6559103e4437facd7aecbcd373479c9 (patch) | |
| tree | 946b5531baddce4387ac7786f7230c3d52dd1161 /xlators/features | |
| parent | 26cbd3bdf5dad190559afbdf0ac125262c4e90a6 (diff) | |
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 <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/10129
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators/features')
4 files changed, 5 insertions, 13 deletions
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" |