OS-2559 illumos-extra should provide native node in proto.strap

          --- old/./Makefile
          +++ new/./Makefile

   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, Version 1.0 only
   6    6  # (the "License").  You may not use this file except in compliance
   7    7  # with the License.
   8    8  #
   9    9  # You can obtain a copy of the license at COPYING
  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 COPYING.
  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  # Copyright (c) 2012, Joyent, Inc.
  22   22  #
  23   23  # To build everything just run 'gmake' in this directory.
  24   24  #
  25   25  
  26   26  BASE =          $(PWD)
  27   27  DESTDIR =       $(BASE)/proto
  28   28  PATH =          $(DESTDIR)/usr/bin:/usr/bin:/usr/sbin:/sbin:/opt/local/bin
  29   29  SUBDIRS = \
  30   30          bash \
  31   31          bind \
  32   32          bzip2 \
  33   33          coreutils \
  34   34          cpp \
  35   35          curl \
  36   36          dialog \
  37   37          g11n \
  38   38          gnupg \
  39   39          gtar \
  40   40          gzip \
  41   41          ipmitool \
  42   42          less \
  43   43          libexpat \
  44   44          libidn \
  45   45          libm \
  46   46          libxml \
  47   47          libz \
  48   48          make \
  49   49          ncurses \
  50   50          node.js \
  51   51          nss-nspr \
  52   52          ntp \
  53   53          openldap \
  54   54          openlldp \
  55   55          openssl \
  56   56          openssl1x \
  57   57          pbzip2 \
  58   58          perl \
  59   59          rsync \
  60   60          rsyslog \
  61   61          screen \
  62   62          socat \
  63   63          tun \
  64   64          uuid \
  65   65          vim \
  66   66          wget

  67   67  
  68   68  STRAP_SUBDIRS = \
  69   69          cpp \
  70   70          bzip2 \
  71   71          libexpat \
  72   72          libidn \
  73   73          libm \
  74   74          libxml \
  75   75          libz \
  76   76          make \
       77 +        node.js \
  77   78          nss-nspr \
  78   79          openssl1x \
  79   80          perl
  80   81  
  81   82  NAME =  illumos-extra
  82   83  
  83   84  AWK =           $(shell (which gawk 2>/dev/null | grep -v "^no ") || which awk)
  84   85  BRANCH =        $(shell git symbolic-ref HEAD | $(AWK) -F/ '{print $$3}')
  85   86  
  86   87  ifeq ($(TIMESTAMP),)

  87   88    TIMESTAMP =   $(shell date -u "+%Y%m%dT%H%M%SZ")
  88   89  endif
  89   90  
  90   91  GITDESCRIBE = \
  91   92          g$(shell git describe --all --long | $(AWK) -F'-g' '{print $$NF}')
  92   93  
  93   94  TARBALL =       $(NAME)-$(BRANCH)-$(TIMESTAMP)-$(GITDESCRIBE).tgz
  94   95  
  95   96  all: $(SUBDIRS)
  96   97  
  97   98  strap: $(STRAP_SUBDIRS)
  98   99  
  99  100  curl: libz openssl1x libidn
 100  101  gzip: libz
 101  102  node.js: openssl1x libm
 102  103  ncurses: libm
 103  104  dialog: ncurses
 104  105  socat: openssl1x
 105  106  wget: openssl1x libidn
 106  107  openldap: openssl1x
 107  108  libm: make
 108  109  g11n: make
 109  110  perl: libm
 110  111  
 111  112  #
 112  113  # pkg-config may be installed. This will actually only hurt us rather than help
 113  114  # us. pkg-config is based as a part of the pkgsrc packages and will pull in
 114  115  # versions of libraries that we have in /opt/local rather than using the ones in
 115  116  # /usr that we want. PKG_CONFIG_LIBDIR controls the actual path. This
 116  117  # environment variable nulls out the search path. Other vars just control what
 117  118  # gets appended.
 118  119  #
 119  120  
 120  121  $(DESTDIR)/usr/gnu/bin/gas: FRC

 121  122          (cd binutils && \
 122  123              PKG_CONFIG_LIBDIR="" \
 123  124              STRAP=$(STRAP) \
 124  125              $(MAKE) DESTDIR=$(DESTDIR) install)
 125  126  
 126  127  
 127  128  $(DESTDIR)/usr/bin/gcc: $(DESTDIR)/usr/gnu/bin/gas
 128  129          (cd gcc4 && \
 129  130              PKG_CONFIG_LIBDIR="" \
 130  131              STRAP=$(STRAP) \
 131      -            $(MAKE) DESTDIR=$(DESTDIR) install)
      132 +            $(MAKE) DESTDIR=$(DESTDIR) install strapfix)
 132  133  
 133  134  $(SUBDIRS): $(DESTDIR)/usr/bin/gcc
 134  135          (cd $@ && \
 135  136              PKG_CONFIG_LIBDIR="" \
 136  137              STRAP=$(STRAP) \
 137  138              $(MAKE) DESTDIR=$(DESTDIR) install)
 138  139  
 139  140  install: $(SUBDIRS) gcc4 binutils
 140  141  
 141  142  install_strap: $(STRAP_SUBDIRS) gcc4 binutils

 142  143  
 143  144  clean: 
 144  145          -for dir in $(SUBDIRS) gcc4 binutils; \
 145  146              do (cd $$dir; $(MAKE) DESTDIR=$(DESTDIR) clean); done
 146  147          -rm -rf proto
 147  148  
 148  149  manifest:
 149  150          cp manifest $(DESTDIR)/$(DESTNAME)
 150  151  
 151  152  tarball:
 152  153          tar -zcf $(TARBALL) manifest proto
 153  154  
 154  155  FRC:
 155  156  
 156  157  .PHONY: manifest

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX