Print this page
8411 Build should warn when linking against libraries outside proto area

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/pyzfs/Makefile.com
          +++ new/usr/src/lib/pyzfs/Makefile.com
↓ open down ↓ 12 lines elided ↑ open up ↑
  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 (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
       23 +# Copyright 2017 RackTop Systems.
  23   24  #
  24   25  
  25   26  LIBRARY =       ioctl.a
  26   27  VERS =
  27   28  OBJECTS =       ioctl.o
  28   29  
  29   30  PYSRCS=         __init__.py util.py dataset.py \
  30   31          allow.py unallow.py \
  31   32          userspace.py groupspace.py holds.py table.py
  32   33  
↓ open down ↓ 11 lines elided ↑ open up ↑
  44   45  C99LMODE=       -Xc99=%all
  45   46  
  46   47  LIBS =          $(DYNLIB)
  47   48  LDLIBS +=       -lc -lnvpair -lpython$(PYTHON_VERSION) -lzfs
  48   49  CFLAGS +=       $(CCVERBOSE)
  49   50  CERRWARN +=     -_gcc=-Wno-unused-variable
  50   51  CPPFLAGS +=     -I$(ADJUNCT_PROTO)/usr/include/python$(PYTHON_VERSION)
  51   52  CPPFLAGS +=     -I../../../uts/common/fs/zfs
  52   53  CPPFLAGS +=     -I../../../common/zfs
  53   54  
       55 +# Allow libpython to be taken from outside of the proto area.
       56 +$(ADJUNCT_PROTO_NOT_SET)DYNFLAGS += \
       57 +        $(ZASSERTDEFLIB)=libpython$(PYTHON_VERSION).so
       58 +
  54   59  .KEEP_STATE:
  55   60  
  56   61  all: $(PYOBJS) $(LIBS)
  57   62  
  58   63  install: all $(ROOTPYZFSFILES)
  59   64  
  60   65  $(ROOTLIBDIR)/%: %
  61   66          $(INS.pyfile)
  62   67  
  63   68  $(ROOTLIBDIR)/%: ../common/%
  64   69          $(INS.pyfile)
  65   70  
  66   71  lint: lintcheck
  67   72  
  68   73  include ../../Makefile.targ
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX