Print this page
12311 adjust NATIVE_LIBS in SMF makefiles

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/svc/configd/Makefile
          +++ new/usr/src/cmd/svc/configd/Makefile
↓ open down ↓ 16 lines elided ↑ open up ↑
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  #
  22   22  # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  23   23  # Use is subject to license terms.
  24   24  #
  25   25  # Copyright 2015 RackTop Systems.
  26   26  #
  27      -# Copyright 2019 Joyent, Inc.
       27 +# Copyright 2020 Joyent, Inc.
  28   28  #
  29   29  
  30   30  MYPROG = svc.configd
  31   31  MYOBJS = \
  32   32          backend.o \
  33   33          configd.o \
  34   34          client.o \
  35   35          file_object.o \
  36   36          maindoor.o \
  37   37          object.o \
↓ open down ↓ 33 lines elided ↑ open up ↑
  71   71  
  72   72  CLOBBERFILES += $(MYPROG:%=%-native)
  73   73  
  74   74  LIBUUTIL        = $(SRC)/lib/libuutil
  75   75  LIBSCF          = $(SRC)/lib/libscf
  76   76  
  77   77  SCRIPTFILE      = restore_repository
  78   78  ROOTSCRIPTFILE  = $(ROOTCMDDIR)/$(SCRIPTFILE)
  79   79  
  80   80  #
  81      -# Native variant (used in ../seed)
       81 +# Native variant (used in ../seed). We only need to set NATIVE_LIBS if
       82 +# $(ADJUNCT_PROTO) is pointing outside of /usr/lib.
  82   83  #
       84 +$(NO_ADJUNCT_PROTO)NATIVE_LIBS += libumem.so libc.so
  83   85  $(NATIVE_BUILD)CC =     $(NATIVECC)
  84   86  $(NATIVE_BUILD)LD =     $(NATIVELD)
  85   87  $(NATIVE_BUILD)CFLAGS = $(NATIVE_CFLAGS)
  86   88  $(NATIVE_BUILD)CPPFLAGS = $(MYCPPFLAGS) -I$(LIBUUTIL)/common -I$(LIBSCF)/inc
  87   89  $(NATIVE_BUILD)CPPFLAGS += -DNATIVE_BUILD
  88   90  $(NATIVE_BUILD)LDFLAGS = $(BDIRECT)
  89   91  $(NATIVE_BUILD)LDLIBS = -L$(ADJUNCT_PROTO)/usr/lib -R$(ADJUNCT_PROTO)/usr/lib \
  90   92                          -L$(LIBUUTIL)/native -R $(LIBUUTIL)/native $(MYLDLIBS)
  91   93  
  92   94  DIRMODE = 0755
↓ open down ↓ 43 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX