Print this page
3664 pkg/Makefile openssl logic should be removed

Split Close
Expand all
Collapse all
          --- old/usr/src/pkg/Makefile
          +++ new/usr/src/pkg/Makefile
↓ open down ↓ 144 lines elided ↑ open up ↑
 145  145  #
 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      -OPENSSL =       /usr/bin/openssl
 156      -OPENSSL10.cmd = $(OPENSSL) version | $(NAWK) '{if($$2<1){print "\043";}}'
 157      -OPENSSL10_ONLY  =       $(OPENSSL10.cmd:sh)
 158      -
 159  155  #
 160  156  # macros and transforms needed by pkgmogrify
 161  157  #
 162  158  # If you append to this list using target-specific assignments (:=),
 163  159  # be very careful that the targets are of the form $(PDIR)/pkgname.  If
 164  160  # you use a higher level target, or a package list, you'll trigger a
 165  161  # complete reprocessing of all manifests because they'll fail command
 166  162  # dependency checking.
 167  163  #
 168  164  PM_TRANSFORMS= common_actions publish restart_fmri facets defaults \
 169  165          extract_metadata
 170  166  PM_INC= transforms manifests
 171  167  
 172  168  PKGMOG_DEFINES= \
 173  169          i386_ONLY=$(POUND_SIGN) \
 174  170          sparc_ONLY=$(POUND_SIGN) \
 175      -        OPENSSL10_ONLY=$(OPENSSL10_ONLY) \
 176  171          $(PKGMACH)_ONLY= \
 177  172          ARCH=$(PKGMACH) \
 178  173          ARCH32=$($(PKGMACH)_ARCH32) \
 179  174          ARCH64=$($(PKGMACH)_ARCH64) \
 180  175          PKGVERS_COMPONENT=$(PKGVERS_COMPONENT) \
 181  176          PKGVERS_BUILTON=$(PKGVERS_BUILTON) \
 182  177          PKGVERS_BRANCH=$(PKGVERS_BRANCH) \
 183  178          PKGVERS=$(PKGVERS)
 184  179  
 185  180  PKGDEP_TOKENS_i386= \
↓ open down ↓ 560 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX