Print this page
1681 support for BUILD64=# no longer works

Split Close
Expand all
Collapse all
          --- old/usr/src/pkg/Makefile
          +++ new/usr/src/pkg/Makefile
↓ open down ↓ 13 lines elided ↑ open up ↑
  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  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  
  22   22  #
  23   23  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
       24 +# Copyright 2014 Andrew Stormont.
  24   25  #
  25   26  
  26   27  include $(SRC)/Makefile.master
  27   28  include $(SRC)/Makefile.buildnum
  28   29  
  29   30  #
  30   31  # Make sure we're getting a consistent execution environment for the
  31   32  # embedded scripts.
  32   33  #
  33   34  SHELL= /usr/bin/ksh93
↓ open down ↓ 128 lines elided ↑ open up ↑
 162  163  # dependency checking.
 163  164  #
 164  165  PM_TRANSFORMS= common_actions publish restart_fmri facets defaults \
 165  166          extract_metadata
 166  167  PM_INC= transforms manifests
 167  168  
 168  169  PKGMOG_DEFINES= \
 169  170          i386_ONLY=$(POUND_SIGN) \
 170  171          sparc_ONLY=$(POUND_SIGN) \
 171  172          $(PKGMACH)_ONLY= \
      173 +        i386_BUILD64=$(POUND_SIGN) \
      174 +        sparc_BUILD64=$(POUND_SIGN) \
      175 +        $(PKGMACH)_BUILD64= \
 172  176          ARCH=$(PKGMACH) \
 173  177          ARCH32=$($(PKGMACH)_ARCH32) \
 174  178          ARCH64=$($(PKGMACH)_ARCH64) \
      179 +        BUILD64=$(BUILD64) \
 175  180          PKGVERS_COMPONENT=$(PKGVERS_COMPONENT) \
 176  181          PKGVERS_BUILTON=$(PKGVERS_BUILTON) \
 177  182          PKGVERS_BRANCH=$(PKGVERS_BRANCH) \
 178  183          PKGVERS=$(PKGVERS)
 179  184  
 180  185  PKGDEP_TOKENS_i386= \
 181  186          'PLATFORM=i86hvm' \
 182  187          'PLATFORM=i86pc' \
 183  188          'PLATFORM=i86xpv' \
 184  189          'ISALIST=amd64' \
↓ open down ↓ 535 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX