Print this page
7661 illumos should provide 64bit perl modules (for omni)

Split Close
Expand all
Collapse all
          --- old/usr/src/Makefile.master
          +++ new/usr/src/Makefile.master
↓ open down ↓ 20 lines elided ↑ open up ↑
  21   21  
  22   22  #
  23   23  # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  24   24  # Copyright 2012 OmniTI Computer Consulting, Inc.  All rights reserved.
  25   25  # Copyright (c) 2012 by Delphix. All rights reserved.
  26   26  # Copyright 2014 Garrett D'Amore <garrett@damore.org>
  27   27  # Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved.
  28   28  # Copyright 2015 Gary Mills
  29   29  # Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
  30   30  # Copyright 2016 Toomas Soome <tsoome@me.com>
       31 +# Copyright 2016 RackTop Systems.
  31   32  #
  32   33  
  33   34  #
  34   35  # Makefile.master, global definitions for system source
  35   36  #
  36   37  ROOT=           /proto
  37   38  
  38   39  #
  39   40  # Adjunct root, containing an additional proto area to be used for headers
  40   41  # and libraries.
↓ open down ↓ 58 lines elided ↑ open up ↑
  99  100  __SUNC=                 $(POUND_SIGN)
 100  101  $(__SUNC)__GNUC=        $(POUND_SIGN)
 101  102  __GNUC64=               $(__GNUC)
 102  103  
 103  104  # Allow build-time "configuration" to enable or disable some things.
 104  105  # The default is POUND_SIGN, meaning "not enabled". If the environment
 105  106  # passes in an override like ENABLE_SMB_PRINTING= (empty) that will
 106  107  # uncomment things in the lower Makefiles to enable the feature.
 107  108  ENABLE_IPP_PRINTING=    $(POUND_SIGN)
 108  109  ENABLE_SMB_PRINTING=    $(POUND_SIGN)
      110 +ENABLE_64BIT_PERL=      $(POUND_SIGN)
 109  111  
 110  112  # CLOSED is the root of the tree that contains source which isn't released
 111  113  # as open source
 112  114  CLOSED=         $(SRC)/../closed
 113  115  
 114  116  # BUILD_TOOLS is the root of all tools including compilers.
 115  117  # ONBLD_TOOLS is the root of all the tools that are part of SUNWonbld.
 116  118  
 117  119  BUILD_TOOLS=            /ws/onnv-tools
 118  120  ONBLD_TOOLS=            $(BUILD_TOOLS)/onbld
↓ open down ↓ 50 lines elided ↑ open up ↑
 169  171  CTFMERGE=       $(ONBLD_TOOLS)/bin/$(MACH)/ctfmerge
 170  172  CTFSTABS=       $(ONBLD_TOOLS)/bin/$(MACH)/ctfstabs
 171  173  CTFSTRIP=       $(ONBLD_TOOLS)/bin/$(MACH)/ctfstrip
 172  174  NDRGEN=         $(ONBLD_TOOLS)/bin/$(MACH)/ndrgen
 173  175  GENOFFSETS=     $(ONBLD_TOOLS)/bin/genoffsets
 174  176  XREF=           $(ONBLD_TOOLS)/bin/xref
 175  177  FIND=           /usr/bin/find
 176  178  PERL=           /usr/bin/perl
 177  179  PERL_VERSION=   5.16.1
 178  180  PERL_PKGVERS=   -5161
 179      -PERL_ARCH=      i86pc-solaris-thread-multi-64int
 180      -PERL_ARCH64=    i86pc-solaris-thread-multi-64
 181      -$(SPARC_BLD)PERL_ARCH= sun4-solaris-thread-multi-64int
 182      -$(SPARC_BLD)PERL_ARCH64= sun4-solaris-thread-multi-64int
      181 +PERL_MACH=      i86pc
      182 +$(SPARC_BLD)PERL_MACH=  sun4
      183 +PERL_ARCH=      $(PERL_MACH)-solaris$(PERL_VARIANT)-64int
      184 +PERL_ARCH64=    $(PERL_MACH)-solaris$(PERL_VARIANT)-64
 183  185  PYTHON_VERSION= 2.7
 184  186  PYTHON_PKGVERS= -27
 185  187  PYTHON=         /usr/bin/python$(PYTHON_VERSION)
 186  188  SORT=           /usr/bin/sort
 187  189  TOUCH=          /usr/bin/touch
 188  190  WC=             /usr/bin/wc
 189  191  XARGS=          /usr/bin/xargs
 190  192  ELFEDIT=        /usr/bin/elfedit
 191  193  ELFSIGN=        /usr/bin/elfsign
 192  194  DTRACE=         /usr/sbin/dtrace -xnolibs
↓ open down ↓ 512 lines elided ↑ open up ↑
 705  707  COMPILE.java=   $(JAVAC) $(JAVAFLAGS) -classpath $(CLASSPATH)
 706  708  
 707  709  #
 708  710  # Link time macros
 709  711  #
 710  712  CCNEEDED                = -lC
 711  713  CCEXTNEEDED             = -lCrun -lCstd
 712  714  $(__GNUC)CCNEEDED       = -L$(GCCLIBDIR) -lstdc++ -lgcc_s
 713  715  $(__GNUC)CCEXTNEEDED    = $(CCNEEDED)
 714  716  
      717 +CCNEEDED64              = -lCrun
      718 +CCEXTNEEDED64           = -lCrun -lCstd
      719 +$(__GNUC64)CCNEEDED64   = -L$(GCCLIBDIR) -lstdc++ -lgcc_s
      720 +$(__GNUC64)CCEXTNEEDED  = $(CCNEEDED64)
      721 +
 715  722  LINK.c=         $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
 716  723  LINK64.c=       $(CC) $(CFLAGS64) $(CPPFLAGS) $(LDFLAGS)
 717  724  NORUNPATH=      -norunpath -nolib
 718  725  LINK.cc=        $(CCC) $(CCFLAGS) $(CPPFLAGS) $(NORUNPATH) \
 719  726                  $(LDFLAGS) $(CCNEEDED)
 720  727  LINK64.cc=      $(CCC) $(CCFLAGS64) $(CPPFLAGS) $(NORUNPATH) \
 721      -                $(LDFLAGS) $(CCNEEDED)
      728 +                $(LDFLAGS) $(CCNEEDED64)
 722  729  
 723  730  #
 724  731  # lint macros
 725  732  #
 726  733  # Note that the undefine of __PRAGMA_REDEFINE_EXTNAME can be removed once
 727  734  # ON is built with a version of lint that has the fix for 4484186.
 728  735  #
 729  736  ALWAYS_LINT_DEFS =      -errtags=yes -s
 730  737  ALWAYS_LINT_DEFS +=     -erroff=E_PTRDIFF_OVERFLOW
 731  738  ALWAYS_LINT_DEFS +=     -erroff=E_ASSIGN_NARROW_CONV
↓ open down ↓ 22 lines elided ↑ open up ↑
 754  761  LINT64.c=       $(LINT) $(ONLY_LINT_DEFS) $(LINTFLAGS64) $(CPPFLAGS) \
 755  762                  $(ALWAYS_LINT_DEFS)
 756  763  LINT.s=         $(LINT.c)
 757  764  
 758  765  # For some future builds, NATIVE_MACH and MACH might be different.
 759  766  # Therefore, NATIVE_MACH needs to be redefined in the
 760  767  # environment as `uname -p` to override this macro.
 761  768  #
 762  769  # For now at least, we cross-compile amd64 on i386 machines.
 763  770  NATIVE_MACH=    $(MACH:amd64=i386)
      771 +NATIVE_MACH64=  $(MACH64)
 764  772  
 765  773  # Define native compilation macros
 766  774  #
 767  775  
 768  776  # Base directory where compilers are loaded.
 769  777  # Defined here so it can be overridden by developer.
 770  778  #
 771  779  SPRO_ROOT=              $(BUILD_TOOLS)/SUNWspro
 772  780  SPRO_VROOT=             $(SPRO_ROOT)/SS12
 773  781  GNU_ROOT=               /usr
↓ open down ↓ 45 lines elided ↑ open up ↑
 819  827  amd64_LD=               /usr/ccs/bin/ld
 820  828  amd64_LINT=             $(SPRO_ROOT)/sunstudio12.1/bin/lint
 821  829  
 822  830  NATIVECC=               $($(NATIVE_MACH)_CC)
 823  831  NATIVECCC=              $($(NATIVE_MACH)_CCC)
 824  832  NATIVECPP=              $($(NATIVE_MACH)_CPP)
 825  833  NATIVEAS=               $($(NATIVE_MACH)_AS)
 826  834  NATIVELD=               $($(NATIVE_MACH)_LD)
 827  835  NATIVELINT=             $($(NATIVE_MACH)_LINT)
 828  836  
      837 +NATIVECC64=             $($(NATIVE_MACH64)_CC)
      838 +NATIVECCC64=            $($(NATIVE_MACH64)_CCC)
      839 +NATIVECPP64=            $($(NATIVE_MACH64)_CPP)
      840 +NATIVEAS64=             $($(NATIVE_MACH64)_AS)
      841 +NATIVELD64=             $($(NATIVE_MACH64)_LD)
      842 +NATIVELINT64=           $($(NATIVE_MACH64)_LINT)
      843 +
 829  844  #
 830  845  # Makefile.master.64 overrides these settings
 831  846  #
 832  847  CC=                     $(NATIVECC)
 833  848  CCC=                    $(NATIVECCC)
 834  849  CPP=                    $(NATIVECPP)
 835  850  AS=                     $(NATIVEAS)
 836  851  LD=                     $(NATIVELD)
 837  852  LINT=                   $(NATIVELINT)
 838  853  
      854 +CC64=                   $(NATIVECC64)
      855 +CCC64=                  $(NATIVECCC64)
      856 +CPP64=                  $(NATIVECPP64)
      857 +AS64=                   $(NATIVEAS64)
      858 +LD64=                   $(NATIVELD64)
      859 +LINT64=                 $(NATIVELINT64)
      860 +
 839  861  # The real compilers used for this build
 840  862  CW_CC_CMD=              $(CC) -_compiler
 841  863  CW_CCC_CMD=             $(CCC) -_compiler
 842  864  REAL_CC=                $(CW_CC_CMD:sh)
 843  865  REAL_CCC=               $(CW_CCC_CMD:sh)
 844  866  
 845  867  # Pass -Y flag to cpp (method of which is release-dependent)
 846  868  CCYFLAG=                -Y I,
 847  869  
 848  870  BDIRECT=        -Bdirect
↓ open down ↓ 331 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX