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/nfs/server | |
| 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/nfs/server')
| -rw-r--r-- | xlators/nfs/server/src/mount3.h | 2 | ||||
| -rw-r--r-- | xlators/nfs/server/src/nfs-common.h | 2 | ||||
| -rw-r--r-- | xlators/nfs/server/src/nfs3-fh.h | 2 | ||||
| -rw-r--r-- | xlators/nfs/server/src/nlm4.h | 2 |
4 files changed, 4 insertions, 4 deletions
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 <sys/types.h> -#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" |