OS-3330 NTP should ship with CTF data
OS-3331 OpenLLDP should ship with CTF data

          --- 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) 2014, 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  
  29   29  ifeq ($(STRAP),strap)
  30   30  STRAPPROTO =    $(DESTDIR)
  31   31  else
  32   32  STRAPPROTO =    $(DESTDIR:proto=proto.strap)
  33   33  endif
  34   34  
  35   35  PATH =          $(STRAPPROTO)/usr/bin:/usr/bin:/usr/sbin:/sbin:/opt/local/bin
  36   36  SUBDIRS = \
  37   37          bash \
  38   38          bind \
  39   39          bzip2 \
  40   40          coreutils \
  41   41          cpp \
  42   42          curl \
  43   43          dialog \
  44   44          g11n \
  45   45          gnupg \
  46   46          gtar \
  47   47          gzip \
  48   48          ipmitool \
  49   49          less \
  50   50          libexpat \
  51   51          libidn \
  52   52          libm \
  53   53          libxml \
  54   54          libz \
  55   55          make \
  56   56          ncurses \
  57   57          node.js \
  58   58          nss-nspr \
  59   59          ntp \
  60   60          openldap \
  61   61          openlldp \
  62   62          openssl \
  63   63          openssl1x \
  64   64          pbzip2 \
  65   65          perl \
  66   66          rsync \
  67   67          rsyslog \
  68   68          screen \
  69   69          socat \
  70   70          tun \
  71   71          uuid \
  72   72          vim \
  73   73          wget
  74   74  
  75   75  STRAP_SUBDIRS = \
  76   76          cpp \
  77   77          bzip2 \
  78   78          libexpat \
  79   79          libidn \
  80   80          libm \
  81   81          libxml \
  82   82          libz \
  83   83          make \
  84   84          node.js \
  85   85          nss-nspr \
  86   86          openssl1x \
  87   87          perl
  88   88  
  89   89  NAME =  illumos-extra
  90   90  
  91   91  AWK =           $(shell (which gawk 2>/dev/null | grep -v "^no ") || which awk)
  92   92  BRANCH =        $(shell git symbolic-ref HEAD | $(AWK) -F/ '{print $$3}')
  93   93  
  94   94  ifeq ($(TIMESTAMP),)
  95   95    TIMESTAMP =   $(shell date -u "+%Y%m%dT%H%M%SZ")
  96   96  endif
  97   97  
  98   98  GITDESCRIBE = \
  99   99          g$(shell git describe --all --long | $(AWK) -F'-g' '{print $$NF}')
 100  100  
 101  101  TARBALL =       $(NAME)-$(BRANCH)-$(TIMESTAMP)-$(GITDESCRIBE).tgz
 102  102  
 103  103  all: $(SUBDIRS)
 104  104  
 105  105  strap: $(STRAP_SUBDIRS)
 106  106  
 107  107  curl: libz openssl1x libidn
 108  108  gzip: libz
 109  109  node.js: openssl1x libm
 110  110  ncurses: libm
 111  111  dialog: ncurses
 112  112  socat: openssl1x
 113  113  wget: openssl1x libidn
 114  114  openldap: openssl1x
 115  115  libm: make
 116  116  g11n: make
 117  117  perl: libm
 118  118  ntp: perl openssl1x
 119  119  
 120  120  #
 121  121  # pkg-config may be installed. This will actually only hurt us rather than help
 122  122  # us. pkg-config is based as a part of the pkgsrc packages and will pull in
 123  123  # versions of libraries that we have in /opt/local rather than using the ones in
 124  124  # /usr that we want. PKG_CONFIG_LIBDIR controls the actual path. This
 125  125  # environment variable nulls out the search path. Other vars just control what
 126  126  # gets appended.
 127  127  #
 128  128  
 129  129  $(DESTDIR)/usr/gnu/bin/gas: FRC
 130  130          (cd binutils && \
 131  131              PKG_CONFIG_LIBDIR="" \
 132  132              STRAP=$(STRAP) \
 133  133              $(MAKE) DESTDIR=$(DESTDIR) install)
 134  134  
 135  135  

 136  136  $(DESTDIR)/usr/bin/gcc: $(DESTDIR)/usr/gnu/bin/gas
 137  137          (cd gcc4 && \
 138  138              PKG_CONFIG_LIBDIR="" \
 139  139              STRAP=$(STRAP) \
 140  140              $(MAKE) DESTDIR=$(DESTDIR) install strapfix)
 141  141  
 142  142  $(SUBDIRS): $(DESTDIR)/usr/bin/gcc
 143  143          (cd $@ && \
 144  144              PKG_CONFIG_LIBDIR="" \
 145  145              STRAP=$(STRAP) \
      146 +            CTFMERGE=$(CTFMERGE) \
      147 +            CTFCONVERT=$(CTFCONVERT) \
 146  148              $(MAKE) DESTDIR=$(DESTDIR) install)
 147  149  
 148  150  install: $(SUBDIRS) gcc4 binutils
 149  151  
 150  152  install_strap: $(STRAP_SUBDIRS) gcc4 binutils
 151  153  
 152  154  clean:
 153  155          -for dir in $(SUBDIRS) gcc4 binutils; \
 154  156              do (cd $$dir; $(MAKE) DESTDIR=$(DESTDIR) clean); done
 155  157          -rm -rf proto
 156  158  
 157  159  manifest:
 158  160          cp manifest $(DESTDIR)/$(DESTNAME)
 159  161  
 160  162  tarball:
 161  163          tar -zcf $(TARBALL) manifest proto
 162  164  
 163  165  FRC:
 164  166  
 165  167  .PHONY: manifest
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX