Print this page
4863 illumos-gate can't be built with fresh perl versions
Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/pkg/Makefile
          +++ new/usr/src/pkg/Makefile
↓ open down ↓ 129 lines elided ↑ open up ↑
 130  130  
 131  131  PKGPUBLISHER= $(PKGPUBLISHER_REDIST)
 132  132  
 133  133  #
 134  134  # To get these defaults, manifests should simply refer to $(PKGVERS).
 135  135  #
 136  136  PKGVERS_COMPONENT= 0.$(RELEASE)
 137  137  PKGVERS_BUILTON= $(RELEASE)
 138  138  PKGVERS_BRANCH= 0.$(ONNV_BUILDNUM)
 139  139  PKGVERS= $(PKGVERS_COMPONENT),$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH)
      140 +PERL_PKGVERS.cmd= print $(PERL_VERSION) | sed 's/\.//g' | head -c 3
      141 +PERL_PKGVERS= $(PERL_PKGVERS.cmd:sh)
 140  142  
 141  143  #
 142  144  # The ARCH32 and ARCH64 macros are used in the manifests to express
 143  145  # architecture-specific subdirectories in the installation paths
 144  146  # for isaexec'd commands.
 145  147  #
 146  148  # We can't simply use $(MACH32) and $(MACH64) here, because they're
 147  149  # only defined for the build architecture.  To do cross-platform
 148  150  # packaging, we need both values.
 149  151  #
↓ open down ↓ 18 lines elided ↑ open up ↑
 168  170  PKGMOG_DEFINES= \
 169  171          i386_ONLY=$(POUND_SIGN) \
 170  172          sparc_ONLY=$(POUND_SIGN) \
 171  173          $(PKGMACH)_ONLY= \
 172  174          ARCH=$(PKGMACH) \
 173  175          ARCH32=$($(PKGMACH)_ARCH32) \
 174  176          ARCH64=$($(PKGMACH)_ARCH64) \
 175  177          PKGVERS_COMPONENT=$(PKGVERS_COMPONENT) \
 176  178          PKGVERS_BUILTON=$(PKGVERS_BUILTON) \
 177  179          PKGVERS_BRANCH=$(PKGVERS_BRANCH) \
 178      -        PKGVERS=$(PKGVERS)
      180 +        PKGVERS=$(PKGVERS) \
      181 +        PERL_VERSION=$(PERL_VERSION) \
      182 +        PERL_PKGVERS=$(PERL_PKGVERS)
 179  183  
 180  184  PKGDEP_TOKENS_i386= \
 181  185          'PLATFORM=i86hvm' \
 182  186          'PLATFORM=i86pc' \
 183  187          'PLATFORM=i86xpv' \
 184  188          'ISALIST=amd64' \
 185  189          'ISALIST=i386'
 186  190  PKGDEP_TOKENS_sparc= \
 187  191          'PLATFORM=sun4u' \
 188  192          'PLATFORM=sun4v' \
↓ open down ↓ 531 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX