diff options
author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-06-27 11:37:28 +0000 |
---|---|---|
committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-06-27 11:37:28 +0000 |
commit | 710e454edbf75c28f50414fc34b6f6c5c75d10bd (patch) | |
tree | 22f4547cefe6168734068d0028ba1f9b7088ea4a | |
parent | 8aef19f7563fa7e20f072f46202468eb3bda3868 (diff) | |
parent | 10f4f8a67e909a279f956222b089093a60da6bf9 (diff) | |
download | illumos-joyent-710e454edbf75c28f50414fc34b6f6c5c75d10bd.tar.gz |
[illumos-gate merge]
commit 10f4f8a67e909a279f956222b089093a60da6bf9
8424 usr/src/tools/mandoc should take advantage of NATIVE_ADJUNCT
commit e09ba01dcda5e24964b8632718777b39166d86e4
8418 zfs_prop_get_table() call in zfs_validate_name() is a no-op
-rw-r--r-- | usr/src/lib/libzfs/common/libzfs_dataset.c | 1 | ||||
-rw-r--r-- | usr/src/tools/mandoc/Makefile | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_dataset.c b/usr/src/lib/libzfs/common/libzfs_dataset.c index bd7f649e1c..c9f54c35ce 100644 --- a/usr/src/lib/libzfs/common/libzfs_dataset.c +++ b/usr/src/lib/libzfs/common/libzfs_dataset.c @@ -105,7 +105,6 @@ zfs_validate_name(libzfs_handle_t *hdl, const char *path, int type, namecheck_err_t why; char what; - (void) zfs_prop_get_table(); if (entity_namecheck(path, &why, &what) != 0) { if (hdl != NULL) { switch (why) { diff --git a/usr/src/tools/mandoc/Makefile b/usr/src/tools/mandoc/Makefile index f15d984f09..307ddddfa6 100644 --- a/usr/src/tools/mandoc/Makefile +++ b/usr/src/tools/mandoc/Makefile @@ -11,7 +11,7 @@ # # Copyright 2017 Nexenta Systems, Inc. -# Copyright 2016 Joyent, Inc. +# Copyright 2017 Joyent, Inc. # CMDDIR= $(SRC)/cmd/mandoc @@ -27,6 +27,8 @@ OBJS += fts.o \ strtonum.o CPPFLAGS += -I. -include fts.h +CPPFLAGS += -I$(NATIVE_ADJUNCT)/include +LDFLAGS += -L$(NATIVE_ADJUNCT)/lib -R$(NATIVE_ADJUNCT)/lib .KEEP_STATE: |