make/Import.gmk

*** 1,7 ****
  #
! # Copyright (c) 2012, 2014, 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.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2012, 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.  Oracle designates this
*** 43,54 ****
  
  ################################################################################
  #
  # Import hotspot
  #
  HOTSPOT_BASE_IMPORT_FILES := \
!     $(addprefix $(LIBRARY_PREFIX), jvm.* jsig.* jvm_db.* jvm_dtrace.*) \
      Xusage.txt \
      #
  
  HOTSPOT_SA_IMPORT_FILES := \
      $(addprefix $(LIBRARY_PREFIX), saproc.* sawindbg.*) \
--- 43,62 ----
  
  ################################################################################
  #
  # Import hotspot
  #
+ 
+ # Don't import jsig library for static builds
+ ifneq ($(BUILD_STATIC), true)
+   JSIG_IMPORT = jsig.*
+ else
+   JSIG_IMPORT = 
+ endif
+ 
  HOTSPOT_BASE_IMPORT_FILES := \
!     $(addprefix $(LIBRARY_PREFIX), jvm.* $(JSIG_IMPORT) jvm_db.* jvm_dtrace.*) \
      Xusage.txt \
      #
  
  HOTSPOT_SA_IMPORT_FILES := \
      $(addprefix $(LIBRARY_PREFIX), saproc.* sawindbg.*) \
*** 77,95 ****
  
  SA_TARGETS := $(COPY_HOTSPOT_SA)
  
  ################################################################################
  
! ifeq ($(OPENJDK_TARGET_OS), macosx)
    JSIG_DEBUGINFO := $(strip $(wildcard $(HOTSPOT_DIST)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig$(SHARED_LIBRARY_SUFFIX).dSYM) \
        $(wildcard $(HOTSPOT_DIST)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.diz) )
! else
    JSIG_DEBUGINFO := $(strip $(wildcard $(HOTSPOT_DIST)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.debuginfo) \
        $(wildcard $(HOTSPOT_DIST)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.diz) )
! endif
  
! ifneq ($(OPENJDK_TARGET_OS), windows)
    ifeq ($(JVM_VARIANT_SERVER), true)
      BASE_TARGETS += $(BASE_INSTALL_LIBRARIES_HERE)/server/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX)
      ifneq (, $(JSIG_DEBUGINFO))
        BASE_TARGETS += $(BASE_INSTALL_LIBRARIES_HERE)/server/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I))
      endif
--- 85,104 ----
  
  SA_TARGETS := $(COPY_HOTSPOT_SA)
  
  ################################################################################
  
! ifneq ($(BUILD_STATIC), true)
!   ifeq ($(OPENJDK_TARGET_OS), macosx)
      JSIG_DEBUGINFO := $(strip $(wildcard $(HOTSPOT_DIST)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig$(SHARED_LIBRARY_SUFFIX).dSYM) \
          $(wildcard $(HOTSPOT_DIST)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.diz) )
!   else
      JSIG_DEBUGINFO := $(strip $(wildcard $(HOTSPOT_DIST)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.debuginfo) \
          $(wildcard $(HOTSPOT_DIST)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.diz) )
!   endif
  
!   ifneq ($(OPENJDK_TARGET_OS), windows)
      ifeq ($(JVM_VARIANT_SERVER), true)
        BASE_TARGETS += $(BASE_INSTALL_LIBRARIES_HERE)/server/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX)
        ifneq (, $(JSIG_DEBUGINFO))
          BASE_TARGETS += $(BASE_INSTALL_LIBRARIES_HERE)/server/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I))
        endif
*** 106,115 ****
--- 115,125 ----
          ifneq (,$(JSIG_DEBUGINFO))
            BASE_TARGETS += $(BASE_INSTALL_LIBRARIES_HERE)/minimal/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I))
          endif
        endif
      endif
+   endif
  endif
  
  $(BASE_INSTALL_LIBRARIES_HERE)/server/%$(SHARED_LIBRARY_SUFFIX): $(BASE_INSTALL_LIBRARIES_HERE)/%$(SHARED_LIBRARY_SUFFIX)
          $(MKDIR) -p $(@D)
          $(RM) $@