Print this page
7170 ENABLE_PERL64 multiarch builds
reviewed by: Andrew Stormont <andyjstormont@gmail.com>
reviewed by: Lauri Tirkkonen <lotheac@iki.fi>

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/perl/Makefile.perl
          +++ new/usr/src/cmd/perl/Makefile.perl
↓ open down ↓ 13 lines elided ↑ open up ↑
  14   14  #
  15   15  
  16   16  include $(SRC)/lib/Makefile.lib
  17   17  
  18   18  # PERL_VERSION and PERL_ARCH used to be set here,
  19   19  # but as they were also needed in usr/src/pkg/Makefile,
  20   20  # the definition was moved to usr/src/Makefile.master
  21   21  
  22   22  PERLDIR = $(ADJUNCT_PROTO)/usr/perl5/$(PERL_VERSION)
  23   23  PERLLIBDIR = $(PERLDIR)/lib/$(PERL_ARCH)
       24 +PERLLIBDIR64 = $(PERLDIR)/lib/$(PERL_ARCH64)
  24   25  PERLINCDIR = $(PERLLIBDIR)/CORE
       26 +PERLINCDIR64 = $(PERLLIBDIR64)/CORE
  25   27  
  26   28  PERLMOD = $(MODULE).pm
  27   29  PERLEXT = $(MACH)/$(MODULE).so
       30 +PERLEXT64 = $(MACH64)/$(MODULE).so
  28   31  
  29   32  ROOTPERLDIR = $(ROOT)/usr/perl5/$(PERL_VERSION)
  30   33  ROOTPERLLIBDIR = $(ROOTPERLDIR)/lib/$(PERL_ARCH)
  31   34  ROOTPERLMODDIR = $(ROOTPERLLIBDIR)/Sun/Solaris
  32   35  ROOTPERLEXTDIR = $(ROOTPERLLIBDIR)/auto/Sun/Solaris/$(MODULE)
       36 +ROOTPERLLIBDIR64 = $(ROOTPERLDIR)/lib/$(PERL_ARCH64)
       37 +ROOTPERLMODDIR64 = $(ROOTPERLLIBDIR64)/Sun/Solaris
       38 +ROOTPERLEXTDIR64 = $(ROOTPERLLIBDIR64)/auto/Sun/Solaris/$(MODULE)
  33   39  
  34   40  ROOTPERLMOD = $(ROOTPERLMODDIR)/$(MODULE).pm
  35   41  ROOTPERLEXT = $(ROOTPERLEXTDIR)/$(MODULE).so
       42 +ROOTPERLMOD64 = $(ROOTPERLMODDIR64)/$(MODULE).pm
       43 +ROOTPERLEXT64 = $(ROOTPERLEXTDIR64)/$(MODULE).so
  36   44  
       45 +XSUBPP = $(PERL) $(PERLDIR)/lib/ExtUtils/xsubpp \
       46 +        -typemap $(PERLDIR)/lib/ExtUtils/typemap
       47 +
  37   48  C99MODE = $(C99_ENABLE)
       49 +
       50 +CERRWARN += -_cc=-erroff=E_ATTRIBUTE_UNKNOWN
       51 +CERRWARN += -_cc=-erroff=E_ATTRIBUTE_PARAM_UNDEFINED
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX