Print this page
NEX-5200 native tools must reliably use a native adjunct
Reviewed by: Hans Rosenfeld <hans.rosenfeld@nexenta.com>
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
NEX-4081 Upstream changes from illumos 5916 make libsqlite a real shared lib
Reviewed by: Alex Eremin <a.eremin@nexenta.com>
re #13879 make libsqlite a real shared lib

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/svc/configd/Makefile
          +++ new/usr/src/cmd/svc/configd/Makefile
↓ open down ↓ 73 lines elided ↑ open up ↑
  74   74  
  75   75  #
  76   76  # Native variant (used in ../seed)
  77   77  #
  78   78  $(NATIVE_BUILD)CC =     $(NATIVECC)
  79   79  $(NATIVE_BUILD)LD =     $(NATIVELD)
  80   80  $(NATIVE_BUILD)CFLAGS = $(NATIVE_CFLAGS)
  81   81  $(NATIVE_BUILD)CPPFLAGS = $(MYCPPFLAGS) -I$(LIBUUTIL)/common -I$(LIBSCF)/inc
  82   82  $(NATIVE_BUILD)CPPFLAGS += -DNATIVE_BUILD
  83   83  $(NATIVE_BUILD)LDFLAGS =
  84      -$(NATIVE_BUILD)LDLIBS = -L$(ADJUNCT_PROTO)/usr/lib -R$(ADJUNCT_PROTO)/usr/lib \
       84 +$(NATIVE_BUILD)LDLIBS = -L$(NATIVE_ADJUNCT)/usr/lib \
       85 +                        -R$(NATIVE_ADJUNCT)/usr/lib \
  85   86                          -L$(LIBUUTIL)/native -R $(LIBUUTIL)/native $(MYLDLIBS)
  86   87  
  87   88  DIRMODE = 0755
  88   89  FILEMODE = 0555
  89   90  
  90   91  OBJSQLITE =
  91   92  LIBSQLITE = -lsqlite-sys
  92   93  $(NATIVE_BUILD)OBJSQLITE = $(ROOT)/lib/libsqlite-native.o
  93   94  $(NATIVE_BUILD)LIBSQLITE =
  94   95  
↓ open down ↓ 40 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX