From 7f7296d1f52f1b4308551fafad4eb22e3855b382 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Mon, 23 Jul 2018 11:35:16 +0200 Subject: build: remove uuid from contrib/ Bundling libuuid is not needed anymore, all current distributions provide it now. Some OS's provide their own uuid_*() functions in libc. These may not be fully compatible with libuuid.so found on Linux systems. In that case, either e2fsprogs-libuuid can be installed, or support for the native uuid_*() functions can be added to libglusterfs/src/compat-uuid.h. Change-Id: Icfa48caea81307a3bca549364969c2038911942b Fixes: bz#1607319 Signed-off-by: Niels de Vos --- libglusterfs/src/Makefile.am | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'libglusterfs/src/Makefile.am') diff --git a/libglusterfs/src/Makefile.am b/libglusterfs/src/Makefile.am index bfe0900e547..c7cd3d5e6fc 100644 --- a/libglusterfs/src/Makefile.am +++ b/libglusterfs/src/Makefile.am @@ -71,17 +71,6 @@ noinst_HEADERS = unittest/unittest.h \ $(CONTRIBDIR)/xxhash/xxhash.h \ tier-ctr-interface.h -if !HAVE_LIBUUID -# FIXME: unbundle libuuid, see compat-uuid.h. -libglusterfs_la_SOURCES += $(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 -endif - - eventtypes.h: $(top_srcdir)/events/eventskeygen.py $(PYTHON) $(top_srcdir)/events/eventskeygen.py C_HEADER -- cgit