Print this page
7661 illumos should provide 64bit perl modules

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