2619 asynchronous destruction of ZFS file systems
2747 SPA versioning with zfs feature flags
Reviewed by: Matt Ahrens <mahrens@delphix.com>
Reviewed by: George Wilson <gwilson@delphix.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Dan Kruchinin <dan.kruchinin@gmail.com>
Approved by: Dan McDonald <danmcd@nexenta.com>

          --- old/usr/src/lib/libnvpair/Makefile.com
          +++ new/usr/src/lib/libnvpair/Makefile.com

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.
  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each
  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.

  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  #
  22   22  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  23   23  # Use is subject to license terms.
  24   24  #
  25      -# ident "%Z%%M% %I%     %E% SMI"
       25 +# Copyright (c) 2012 by Delphix. All rights reserved.
  26   26  #
  27   27  
  28   28  LIBRARY=        libnvpair.a
  29   29  VERS=           .1
  30   30  
  31   31  OBJECTS=        libnvpair.o \
  32   32                  nvpair_alloc_system.o \
  33   33                  nvpair_alloc_fixed.o \
  34      -                nvpair.o
       34 +                nvpair.o \
       35 +                fnvpair.o
  35   36  
  36   37  include ../../Makefile.lib
  37   38  include ../../Makefile.rootfs
  38   39  
  39   40  SRCS=           ../libnvpair.c \
  40   41                  ../nvpair_alloc_system.c \
  41   42                  $(SRC)/common/nvpair/nvpair_alloc_fixed.c \
  42      -                $(SRC)/common/nvpair/nvpair.c
       43 +                $(SRC)/common/nvpair/nvpair.c \
       44 +                $(SRC)/common/nvpair/fnvpair.c
  43   45  
  44   46  #
  45   47  # Libraries added to the next line must be present in miniroot
  46   48  #
  47   49  LDLIBS +=       -lc -lnsl
  48   50  LIBS =          $(DYNLIB) $(LINTLIB)
  49   51  
  50   52  # turn off ptr-cast warnings
  51   53  LINTFLAGS64 +=  -erroff=E_BAD_PTR_CAST_ALIGN
  52   54  

  53   55  # turn off warning caused by lint bug: not understanding SCNi8 "hhi"
  54   56  LINTFLAGS +=    -erroff=E_BAD_FORMAT_STR2
  55   57  LINTFLAGS64 +=  -erroff=E_BAD_FORMAT_STR2
  56   58  
  57   59  CFLAGS +=       $(CCVERBOSE)
  58   60  CPPFLAGS +=     -D_REENTRANT
  59   61  
  60   62  $(LINTLIB) :=   SRCS = $(SRCDIR)/$(LINTSRC)
  61   63  
  62   64  .KEEP_STATE:
  63   65  
  64   66  all: $(LIBS)
  65   67  
  66   68  lint: lintcheck
  67   69  
  68   70  include ../../Makefile.targ
  69   71  
  70   72  pics/%.o: $(SRC)/common/nvpair/%.c
  71   73          $(COMPILE.c) -o $@ $<
  72   74          $(POST_PROCESS_O)

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX