diff options
| author | Niels de Vos <ndevos@redhat.com> | 2018-07-23 11:35:16 +0200 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2018-07-27 17:37:32 +0000 |
| commit | 7f7296d1f52f1b4308551fafad4eb22e3855b382 (patch) | |
| tree | b754251445e6703f08ef1271a610e8f831248f23 /libglusterfs | |
| parent | 35cfc01fa2e395111f7d629f00dc06eecf35a709 (diff) | |
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 <ndevos@redhat.com>
Diffstat (limited to 'libglusterfs')
| -rw-r--r-- | libglusterfs/src/Makefile.am | 11 | ||||
| -rw-r--r-- | libglusterfs/src/compat-uuid.h | 8 |
2 files changed, 4 insertions, 15 deletions
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 diff --git a/libglusterfs/src/compat-uuid.h b/libglusterfs/src/compat-uuid.h index 8dac6990388..2e66117ce1f 100644 --- a/libglusterfs/src/compat-uuid.h +++ b/libglusterfs/src/compat-uuid.h @@ -57,6 +57,10 @@ gf_uuid_unparse (const uuid_t uuid, char *out) uuid_unparse (uuid, out); } +#elif defined(__FreeBSD__) + +#error Please install e2fsprogs-libuuid for a compatible libuuid implementation. + /* TODO: add more uuid APIs, use constructs like this: #elif defined(__NetBSD__) * NetBSD libc * @@ -70,9 +74,5 @@ gf_uuid_clear (uuid_t uuid) */ -#else /* use bundled Linux like libuuid from contrib/uuid/ */ - -#include "uuid.h" - #endif /* HAVE_UUID */ #endif /* _GF_UUID_H */ |