make/bsd/makefiles/defs.make

rev 9009 : 8136556: Add the ability to perform static builds of MacOSX x64 binaries
Reviewed-by: ihse, bdelsart, gadams, lfoltan, rriggs, hseigel, twisti

*** 1,7 ****
  #
! # Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.
--- 1,7 ----
  #
! # Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.
*** 184,200 ****
--- 184,203 ----
  
    # Due to the multiple sub-make processes that occur this logic gets
    # executed multiple times. We reduce the noise by at least checking that
    # BUILD_FLAVOR has been set.
    ifneq ($(BUILD_FLAVOR),)
+     # FULL_DEBUG_SYMBOLS not created for individual static libraries
+     ifeq ($(STATIC_BUILD),false)
        ifeq ($(BUILD_FLAVOR), product)
          FULL_DEBUG_SYMBOLS ?= 1
          ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS)
        else
          # debug variants always get Full Debug Symbols (if available)
          ENABLE_FULL_DEBUG_SYMBOLS = 1
        endif
+      endif
      $(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)"))
      # since objcopy is optional, we set ZIP_DEBUGINFO_FILES later
  
      ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
        ifeq ($(OS_VENDOR), Darwin)
*** 254,273 ****
  endif # JDK_6_OR_EARLIER
  
  JDK_INCLUDE_SUBDIR=bsd
  
  # Library suffix
! ifeq ($(OS_VENDOR),Darwin)
    LIBRARY_SUFFIX=dylib
! else
    LIBRARY_SUFFIX=so
  endif
  
  EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
  
  # client and server subdirectories have symbolic links to ../libjsig.so
! EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
  
  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
    ifeq ($(ZIP_DEBUGINFO_FILES),1)
        EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.diz
    else
--- 257,284 ----
  endif # JDK_6_OR_EARLIER
  
  JDK_INCLUDE_SUBDIR=bsd
  
  # Library suffix
! ifneq ($(STATIC_BUILD),true)
!   ifeq ($(OS_VENDOR),Darwin)
      LIBRARY_SUFFIX=dylib
!   else
      LIBRARY_SUFFIX=so
+   endif
+ else
+   LIBRARY_SUFFIX=a
  endif
  
+ 
  EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
  
+ # jsig library not needed for static builds
+ ifneq ($(STATIC_BUILD),true)
  # client and server subdirectories have symbolic links to ../libjsig.so
!   EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
! endif
  
  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
    ifeq ($(ZIP_DEBUGINFO_FILES),1)
        EXPORT_LIST += $(EXPORT_LIB_ARCH_DIR)/libjsig.diz
    else
*** 284,293 ****
--- 295,307 ----
  EXPORT_MINIMAL_DIR = $(EXPORT_LIB_ARCH_DIR)/minimal
  
  ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
    EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
    EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
+   ifeq ($(STATIC_BUILD),true)
+     EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.symbols
+   endif
  
    ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
      ifeq ($(ZIP_DEBUGINFO_FILES),1)
          EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz
      else
*** 301,310 ****
--- 315,327 ----
  endif
  
  ifeq ($(JVM_VARIANT_CLIENT),true)
    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
+   ifeq ($(STATIC_BUILD),true)
+     EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.symbols
+   endif
  
    ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
      ifeq ($(ZIP_DEBUGINFO_FILES),1)
          EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz
      else
*** 318,327 ****
--- 335,347 ----
  endif
  
  ifeq ($(JVM_VARIANT_MINIMAL1),true)
    EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/Xusage.txt
    EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.$(LIBRARY_SUFFIX)
+   ifeq ($(STATIC_BUILD),true)
+     EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.symbols
+   endif
  endif
  
  # Serviceability Binaries
  # No SA Support for PPC, IA64, ARM or zero
  ADD_SA_BINARIES/x86   = $(EXPORT_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
*** 386,403 ****
--- 406,432 ----
      ifneq ($(ALT_JDK_IMAGE_DIR),)
        JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR)
      endif
  
      # Binaries to 'universalize' if built
+     ifneq ($(STATIC_BUILD),true)
        UNIVERSAL_LIPO_LIST += $(EXPORT_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX)
+     endif
      UNIVERSAL_LIPO_LIST += $(EXPORT_LIB_DIR)/libsaproc.$(LIBRARY_SUFFIX)
      UNIVERSAL_LIPO_LIST += $(EXPORT_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX)
      UNIVERSAL_LIPO_LIST += $(EXPORT_LIB_DIR)/client/libjvm.$(LIBRARY_SUFFIX)
  
      # Files to simply copy in place
      UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/server/Xusage.txt
      UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/client/Xusage.txt
+ 
+     ifeq ($(STATIC_BUILD),true)
+       UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/server/libjvm.symbols
+       UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/client/libjvm.symbols
+       UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/minimal/libjvm.symbols
+     endif
+ 
      ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
        ifeq ($(ZIP_DEBUGINFO_FILES),1)
            UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/server/libjvm.diz
            UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/client/libjvm.diz
            UNIVERSAL_COPY_LIST += $(EXPORT_LIB_DIR)/libjsig.diz