Print this page
NEX-5201 use perl interpreter from native adjunct
Reviewed by: Hans Rosenfeld <hans.rosenfeld@nexenta.com>
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
NEX-3128 remove dependency on sysidtool
Reviewed by: Gordon Ross <gwr@nexenta.com>
Reviewed by: Jean McCormack <jean.mccormack@nexenta.com>
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
NEX-3127 nza-kernel can't be built with fresh perl versions
Reviewed by: Gordon Ross <gwr@nexenta.com>
Reviewed by: Jean McCormack <jean.mccormack@nexenta.com>
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/perl/Makefile.perl
          +++ new/usr/src/cmd/perl/Makefile.perl
↓ open down ↓ 11 lines elided ↑ open up ↑
  12   12  # Copyright (c) 2014 Racktop Systems.
  13   13  # Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved.
  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      -PERLDIR = $(ADJUNCT_PROTO)/usr/perl5/$(PERL_VERSION)
       22 +PERLDIR = $(NATIVE_ADJUNCT)/usr/perl5/$(PERL_VERSION)
  23   23  PERLLIBDIR = $(PERLDIR)/lib/$(PERL_ARCH)
  24   24  PERLINCDIR = $(PERLLIBDIR)/CORE
  25   25  
  26   26  PERLMOD = $(MODULE).pm
  27   27  PERLEXT = $(MACH)/$(MODULE).so
  28   28  
  29   29  ROOTPERLDIR = $(ROOT)/usr/perl5/$(PERL_VERSION)
  30   30  ROOTPERLLIBDIR = $(ROOTPERLDIR)/lib/$(PERL_ARCH)
  31   31  ROOTPERLMODDIR = $(ROOTPERLLIBDIR)/Sun/Solaris
  32   32  ROOTPERLEXTDIR = $(ROOTPERLLIBDIR)/auto/Sun/Solaris/$(MODULE)
  33   33  
  34   34  ROOTPERLMOD = $(ROOTPERLMODDIR)/$(MODULE).pm
  35   35  ROOTPERLEXT = $(ROOTPERLEXTDIR)/$(MODULE).so
  36   36  
  37   37  CSTD = $(CSTD_GNU99)
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX