jdk/make/common/shared/Defs-solaris.gmk

Print this page

        

@@ -138,10 +138,12 @@
 # Always build headless on Solaris
 BUILD_HEADLESS = true
 
 _CUPS_HEADERS_PATH=/opt/sfw/cups/include
 
+_BDB_HEADERS_PATH=/usr/include
+
 # Import JDK images allow for partial builds, components not built are
 #    imported (or copied from) these import areas when needed.
 
 # BUILD_JDK_IMPORT_PATH: location of JDK install trees to import for 
 #   multiple platforms, e.g. windows-i586, solaris-sparc, linux-586, etc.

@@ -158,10 +160,20 @@
 else
   JDK_IMPORT_PATH   = $(BUILD_JDK_IMPORT_PATH)/$(PLATFORM)-$(ARCH)$(_JDK_IMPORT_VARIANT)
 endif
 JDK_IMPORT_PATH:=$(call AltCheckValue,JDK_IMPORT_PATH)
 
+# BDB_IMPORT_PATH: location of bdb pre-built/generated files
+ifndef USE_SYSTEM_BDB
+  ifdef ALT_BDB_IMPORT_PATH
+    BDB_IMPORT_PATH :=$(call FullPath,$(ALT_BDB_IMPORT_PATH))
+  else
+    BDB_IMPORT_PATH =  #$(JDK_IMPORT_PATH)   # Can't import from JDK
+  endif
+  #BDB_IMPORT_PATH:=$(call AltCheckValue,BDB_IMPORT_PATH) # TODO: disable for now
+endif
+
 # HOTSPOT_IMPORT_PATH: location of hotspot pre-built files
 ifdef ALT_HOTSPOT_IMPORT_PATH
   HOTSPOT_IMPORT_PATH :=$(call FullPath,$(ALT_HOTSPOT_IMPORT_PATH))
 else
   HOTSPOT_IMPORT_PATH =$(JDK_IMPORT_PATH)