OS-3643 lx brand: add USDT provider to lx_brand.so.1
OS-3644 lx brand: ptrace_init() never called

          --- old/usr/src/lib/Makefile.targ
          +++ new/usr/src/lib/Makefile.targ

   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 (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
       23 +# Copyright (c) 2014, Joyent, Inc.
  23   24  #
  24   25  
  25   26  #
  26   27  # included to define local library targets
  27   28  #
  28   29  
  29   30  # conditional assignment of default permissions for the installed
  30   31  # DYNLIB/DYNLIBCCC.  Set here and in Makefile.mach, instead of Makefile.lib,
  31   32  # because ROOTLIBDIR may be changed in the including makefile after it has
  32   33  # included Makefile.lib.

  33   34  #
  34   35  $(ROOTLIBDIR)/$(DYNLIB) :=      FILEMODE= 755
  35   36  $(ROOTLIBDIR)/$(DYNLIBCCC) :=   FILEMODE= 755
  36   37  
  37   38  $(ROOTFS_LIBDIR)/$(DYNLIB) :=   FILEMODE= 755
  38   39  $(ROOTFS_LIBDIR)/$(DYNLIBCCC) :=        FILEMODE= 755
  39   40  
  40   41  $(ROOTLIBDIR64)/$(DYNLIB) :=    FILEMODE= 755
  41   42  $(ROOTLIBDIR64)/$(DYNLIBCCC) := FILEMODE= 755
  42   43  
  43   44  # install rules
  44   45  $(ROOTHDRDIR)/%: $(HDRDIR)/%
  45   46          $(INS.file)
  46   47  
  47   48  $(ROOTLIBDIR)/%: %
  48   49          $(INS.file)
  49   50  $(ROOTLIBDIR64)/%: %
  50   51          $(INS.file)     
  51   52  $(ROOTFS_LIBDIR)/%: %
  52   53          $(INS.file)
  53   54  $(ROOTFS_LIBDIR64)/%: %
  54   55          $(INS.file)     
  55   56  
  56   57  $(ROOTLIBDIR)/$(LIBLINKS): $(ROOTLIBDIR)/$(LIBLINKS)$(VERS)
  57   58          $(INS.liblink)
  58   59  $(ROOTLIBDIR64)/$(LIBLINKS): $(ROOTLIBDIR64)/$(LIBLINKS)$(VERS)
  59   60          $(INS.liblink64)
  60   61  
  61   62  $(ROOTLIBDIR)/$(LIBLINKSCCC): $(ROOTLIBDIR)/$(LIBLINKSCCC)$(VERS)
  62   63          $(INS.liblinkccc)
  63   64  $(ROOTLIBDIR64)/$(LIBLINKSCCC): $(ROOTLIBDIR64)/$(LIBLINKSCCC)$(VERS)
  64   65          $(INS.liblinkccc64)
  65   66  
  66   67  $(ROOTLINTDIR)/%: $(SRCDIR)/%
  67   68          $(INS.file)
  68   69  $(ROOTFS_LINTDIR)/%: $(SRCDIR)/%
  69   70          $(INS.file)
  70   71  
  71   72  $(ROOTDEMODIRS):
  72   73          $(INS.dir)
  73   74  $(ROOTDEMODIRBASE)/%: $(DEMOFILESRCDIR)/%
  74   75          $(INS.file)
  75   76  
  76   77  objs/%.o pics/%.o: $(SRCDIR)/%.c
  77   78          $(COMPILE.c) -o $@ $<
  78   79          $(POST_PROCESS_O)
  79   80  
  80   81  objs/%.o pics/%.o: $(SRCDIR)/%.cc
  81   82          $(COMPILE.cc) -o $@ $<
  82   83          $(POST_PROCESS_O)

  83   84  
  84   85  objs pics:
  85   86          -@mkdir -p $@
  86   87  
  87   88  $(LIBRARY): objs .WAIT $$(OBJS)
  88   89          $(BUILD.AR)
  89   90          $(POST_PROCESS_A)
  90   91  
  91   92  $(DYNLIB): $$(MAPFILES)
  92   93  
  93      -$(DYNLIB): pics .WAIT $$(PICS) $$(ALTPICS) $$(EXTPICS)
       94 +$(DYNLIB): pics $(USDT_HEADERS) .WAIT $$(PICS) $$(ALTPICS) $$(EXTPICS) .WAIT $(USDT_PICS)
  94   95          $(BUILD.SO)
  95   96          $(POST_PROCESS_SO)
  96   97  
  97   98  $(DYNLIBCCC): pics .WAIT $$(PICS) $$(ALTPICS) $$(EXTPICS)
  98   99          $(BUILDCCC.SO)
  99  100          $(POST_PROCESS_SO)
 100  101  
 101  102  $(LINTLIB): $$(SRCS) 
 102  103          $(LINT.c) -o $(LIBNAME) $(SRCS) > $(LINTOUT) 2>&1 
 103  104  
 104  105  lintcheck: $$(SRCS)
 105  106          $(LINT.c) $(LINTCHECKFLAGS) $(SRCS) $(LDLIBS)
 106  107  
 107  108  clobber: clean
 108  109          -$(RM) $(CLOBBERTARGFILES)
 109  110  
 110  111  clean:
 111      -        -$(RM) $(OBJS)
      112 +        -$(RM) $(OBJS) $(USDT_HEADERS) $(USDT_PICS)
 112  113          -$(RM) $(PICS) $(DUPLICATE_SRC) $(LINTOUT) $(LINTLIB) $(CLEANFILES)
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX