1 From f20520c20ef1f0091222188c481928b92c5ac9d4 Mon Sep 17 00:00:00 2001
   2 From: Alex Wilson <alex.wilson@joyent.com>
   3 Date: Thu, 14 Jan 2016 10:12:07 -0800
   4 Subject: [PATCH 1/2] SmartOS local: make dtrace lib 32-bit
   5 
   6 ---
   7  Makefile.in | 6 +++---
   8  1 file changed, 3 insertions(+), 3 deletions(-)
   9 
  10 diff --git a/Makefile.in b/Makefile.in
  11 index afe15c8..6462088 100644
  12 --- a/Makefile.in
  13 +++ b/Makefile.in
  14 @@ -28,7 +28,7 @@ ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass
  15  SFTP_SERVER=$(libexecdir)/sftp-server
  16  SSH_KEYSIGN=$(libexecdir)/ssh-keysign
  17  SSH_PKCS11_HELPER=$(libexecdir)/ssh-pkcs11-helper
  18 -ROOTDLIBDIR64=$(DESTDIR)/usr/lib/dtrace/64
  19 +ROOTDLIBDIR=$(DESTDIR)/usr/lib/dtrace
  20  SMFMETHODDIR=$(DESTDIR)/lib/svc/method
  21  SMFNETMANIDIR=$(DESTDIR)/lib/svc/manifest/network
  22  PRIVSEP_PATH=@PRIVSEP_PATH@
  23 @@ -240,7 +240,7 @@ sftp_provider.h: $(srcdir)/sftp_provider.d
  24             -o $(srcdir)/sftp_provider.h
  25  
  26  sftp_provider.o: sftp_provider.d sftp_provider.h sftp-server.o
  27 -       /usr/sbin/dtrace -G -64 -xnolibs -s $(srcdir)/sftp_provider.d \
  28 +       /usr/sbin/dtrace -G -xnolibs -s $(srcdir)/sftp_provider.d \
  29             sftp-server.o -o sftp_provider.o
  30  
  31  # special case for sftp-server.o, it includes sftp_provider.h
  32 @@ -362,7 +362,7 @@ install-files:
  33         ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin
  34         -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
  35         ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
  36 -       mkdir -p $(ROOTDLIBDIR64) && cp $(srcdir)/sftp64.d $(ROOTDLIBDIR64)/sftp64.d
  37 +       mkdir -p $(ROOTDLIBDIR) && cp $(srcdir)/sftp64.d $(ROOTDLIBDIR)/sftp.d
  38         $(srcdir)/mkinstalldirs $(SMFMETHODDIR)
  39         $(srcdir)/mkinstalldirs $(SMFNETMANIDIR)
  40         $(INSTALL) -m 555 smf/method.sh $(SMFMETHODDIR)/sshd
  41 -- 
  42 2.5.4 (Apple Git-61)
  43