Print this page
XXX Remove nawk(1)

Split Close
Expand all
Collapse all
          --- old/usr/src/pkg/Makefile
          +++ new/usr/src/pkg/Makefile
↓ open down ↓ 145 lines elided ↑ open up ↑
 146  146  # We can't simply use $(MACH32) and $(MACH64) here, because they're
 147  147  # only defined for the build architecture.  To do cross-platform
 148  148  # packaging, we need both values.
 149  149  #
 150  150  i386_ARCH32= i86
 151  151  sparc_ARCH32= sparcv7
 152  152  i386_ARCH64= amd64
 153  153  sparc_ARCH64= sparcv9
 154  154  
 155  155  OPENSSL =       /usr/bin/openssl
 156      -OPENSSL10.cmd = $(OPENSSL) version | $(NAWK) '{if($$2<1){print "\043";}}'
      156 +OPENSSL10.cmd = $(OPENSSL) version | $(AWK) '{if($$2<1){print "\043";}}'
 157  157  OPENSSL10_ONLY  =       $(OPENSSL10.cmd:sh)
 158  158  
 159  159  #
 160  160  # macros and transforms needed by pkgmogrify
 161  161  #
 162  162  # If you append to this list using target-specific assignments (:=),
 163  163  # be very careful that the targets are of the form $(PDIR)/pkgname.  If
 164  164  # you use a higher level target, or a package list, you'll trigger a
 165  165  # complete reprocessing of all manifests because they'll fail command
 166  166  # dependency checking.
↓ open down ↓ 436 lines elided ↑ open up ↑
 603  603  # creation to work correctly, even when -a was not part of NIGHTLY_OPTIONS,
 604  604  # and it ensures that a protolist file here will always correspond to the
 605  605  # contents of the processed manifests, which can vary depending on build
 606  606  # environment.
 607  607  #
 608  608  $(PKGLISTS): $(PROC_PKGS)
 609  609          $(PKGDEBUG)sdotr=$(@F:packages.%=%); \
 610  610          r=$${sdotr%.+(?)}; s=$${sdotr#+(?).}; \
 611  611          print "Generating $$r $$s package list"; \
 612  612          $(RM) $(@); $(TOUCH) $(@); \
 613      -        $(NAWK) 'BEGIN { \
      613 +        $(AWK) 'BEGIN { \
 614  614                  if (ARGC < 2) { \
 615  615                          exit; \
 616  616                  } \
 617  617                  retcode = 0; \
 618  618                  for (i = 1; i < ARGC; i++) { \
 619  619                          do { \
 620  620                                  e = getline f < ARGV[i]; \
 621  621                          } while ((e == 1) && (f !~ /name=pkg.fmri/)); \
 622  622                          close(ARGV[i]); \
 623  623                          if (e == 1) { \
↓ open down ↓ 32 lines elided ↑ open up ↑
 656  656  
 657  657  #
 658  658  # Staging the license and description files in the proto area allows
 659  659  # us to do proper unreferenced file checking of both license and
 660  660  # description files without blanket exceptions, and to pull license
 661  661  # content without reference to $CODEMGR_WS during publication.
 662  662  #
 663  663  stage-licenses: license-list FRC
 664  664          $(PKGDEBUG)$(MAKE) -e -f Makefile.lic \
 665  665                  PKGDEBUG=$(PKGDEBUG) LICROOT=$(PKGROOT)/licenses \
 666      -                `$(NAWK) '{ \
      666 +                `$(AWK) '{ \
 667  667                          print "$(PKGROOT)/licenses/" $$0; \
 668  668                          print "$(PKGROOT)/licenses/" $$0 ".descrip"; \
 669  669                  }' license-list` > /dev/null;
 670  670  
 671  671  protocmp: makesilent
 672  672          @validate_pkg -a $(PKGMACH) -v \
 673  673                  $(EXCEPTIONS:%=-e $(CODEMGR_WS)/exception_lists/%) \
 674  674                  -m $(PDIR) -p $(PKGROOT) -p $(TOOLSROOT)
 675  675  
 676  676  pmodes: makesilent
↓ open down ↓ 69 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX