Print this page
7661 illumos should provide 64bit perl modules

*** 25,34 **** --- 25,35 ---- # Copyright 2014 Garrett D'Amore <garrett@damore.org> # Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved. # Copyright 2015 Gary Mills # Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com> # Copyright 2016 Toomas Soome <tsoome@me.com> + # Copyright 2016 RackTop Systems. # # # Makefile.master, global definitions for system source #
*** 103,112 **** --- 104,115 ---- # The default is POUND_SIGN, meaning "not enabled". If the environment # passes in an override like ENABLE_SMB_PRINTING= (empty) that will # uncomment things in the lower Makefiles to enable the feature. ENABLE_IPP_PRINTING= $(POUND_SIGN) ENABLE_SMB_PRINTING= $(POUND_SIGN) + ENABLE_32BIT_PERL= $(POUND_SIGN) + ENABLE_64BIT_PERL= $(POUND_SIGN) # CLOSED is the root of the tree that contains source which isn't released # as open source CLOSED= $(SRC)/../closed
*** 173,184 **** XREF= $(ONBLD_TOOLS)/bin/xref FIND= /usr/bin/find PERL= /usr/bin/perl PERL_VERSION= 5.10.0 PERL_PKGVERS= -510 ! PERL_ARCH = i86pc-solaris-64int ! $(SPARC_BLD)PERL_ARCH = sun4-solaris-64int PYTHON_VERSION= 2.7 PYTHON_PKGVERS= -27 PYTHON= /usr/bin/python$(PYTHON_VERSION) SORT= /usr/bin/sort TOUCH= /usr/bin/touch --- 176,189 ---- XREF= $(ONBLD_TOOLS)/bin/xref FIND= /usr/bin/find PERL= /usr/bin/perl PERL_VERSION= 5.10.0 PERL_PKGVERS= -510 ! PERL_MACH= i86pc ! $(SPARC_BLD)PERL_MACH= sun4 ! PERL_ARCH= $(PERL_MACH)-solaris$(PERL_VARIANT)-64int ! PERL_ARCH64= $(PERL_MACH)-solaris$(PERL_VARIANT)-64 PYTHON_VERSION= 2.7 PYTHON_PKGVERS= -27 PYTHON= /usr/bin/python$(PYTHON_VERSION) SORT= /usr/bin/sort TOUCH= /usr/bin/touch
*** 707,723 **** CCNEEDED = -lC CCEXTNEEDED = -lCrun -lCstd $(__GNUC)CCNEEDED = -L$(GCCLIBDIR) -lstdc++ -lgcc_s $(__GNUC)CCEXTNEEDED = $(CCNEEDED) LINK.c= $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) LINK64.c= $(CC) $(CFLAGS64) $(CPPFLAGS) $(LDFLAGS) NORUNPATH= -norunpath -nolib LINK.cc= $(CCC) $(CCFLAGS) $(CPPFLAGS) $(NORUNPATH) \ $(LDFLAGS) $(CCNEEDED) LINK64.cc= $(CCC) $(CCFLAGS64) $(CPPFLAGS) $(NORUNPATH) \ ! $(LDFLAGS) $(CCNEEDED) # # lint macros # # Note that the undefine of __PRAGMA_REDEFINE_EXTNAME can be removed once --- 712,733 ---- CCNEEDED = -lC CCEXTNEEDED = -lCrun -lCstd $(__GNUC)CCNEEDED = -L$(GCCLIBDIR) -lstdc++ -lgcc_s $(__GNUC)CCEXTNEEDED = $(CCNEEDED) + CCNEEDED64 = -lCrun + CCEXTNEEDED64 = -lCrun -lCstd + $(__GNUC64)CCNEEDED64 = -L$(GCCLIBDIR) -lstdc++ -lgcc_s + $(__GNUC64)CCEXTNEEDED = $(CCNEEDED64) + LINK.c= $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) LINK64.c= $(CC) $(CFLAGS64) $(CPPFLAGS) $(LDFLAGS) NORUNPATH= -norunpath -nolib LINK.cc= $(CCC) $(CCFLAGS) $(CPPFLAGS) $(NORUNPATH) \ $(LDFLAGS) $(CCNEEDED) LINK64.cc= $(CCC) $(CCFLAGS64) $(CPPFLAGS) $(NORUNPATH) \ ! $(LDFLAGS) $(CCNEEDED64) # # lint macros # # Note that the undefine of __PRAGMA_REDEFINE_EXTNAME can be removed once
*** 756,765 **** --- 766,776 ---- # Therefore, NATIVE_MACH needs to be redefined in the # environment as `uname -p` to override this macro. # # For now at least, we cross-compile amd64 on i386 machines. NATIVE_MACH= $(MACH:amd64=i386) + NATIVE_MACH64= $(MACH64) # Define native compilation macros # # Base directory where compilers are loaded.
*** 821,830 **** --- 832,848 ---- NATIVECPP= $($(NATIVE_MACH)_CPP) NATIVEAS= $($(NATIVE_MACH)_AS) NATIVELD= $($(NATIVE_MACH)_LD) NATIVELINT= $($(NATIVE_MACH)_LINT) + NATIVECC64= $($(NATIVE_MACH64)_CC) + NATIVECCC64= $($(NATIVE_MACH64)_CCC) + NATIVECPP64= $($(NATIVE_MACH64)_CPP) + NATIVEAS64= $($(NATIVE_MACH64)_AS) + NATIVELD64= $($(NATIVE_MACH64)_LD) + NATIVELINT64= $($(NATIVE_MACH64)_LINT) + # # Makefile.master.64 overrides these settings # CC= $(NATIVECC) CCC= $(NATIVECCC)
*** 831,840 **** --- 849,865 ---- CPP= $(NATIVECPP) AS= $(NATIVEAS) LD= $(NATIVELD) LINT= $(NATIVELINT) + CC64= $(NATIVECC64) + CCC64= $(NATIVECCC64) + CPP64= $(NATIVECPP64) + AS64= $(NATIVEAS64) + LD64= $(NATIVELD64) + LINT64= $(NATIVELINT64) + # The real compilers used for this build CW_CC_CMD= $(CC) -_compiler CW_CCC_CMD= $(CCC) -_compiler REAL_CC= $(CW_CC_CMD:sh) REAL_CCC= $(CW_CCC_CMD:sh)