make/Defs-internal.gmk

Print this page

        

*** 96,105 **** --- 96,106 ---- # Define absolute paths to TOPDIRs ABS_LANGTOOLS_TOPDIR:=$(call OptFullPath,"$(LANGTOOLS_TOPDIR)") ABS_CORBA_TOPDIR:=$(call OptFullPath,"$(CORBA_TOPDIR)") ABS_JAXP_TOPDIR:=$(call OptFullPath,"$(JAXP_TOPDIR)") ABS_JAXWS_TOPDIR:=$(call OptFullPath,"$(JAXWS_TOPDIR)") + ABS_BDB_TOPDIR:=$(call OptFullPath,"$(BDB_TOPDIR)") ABS_JDK_TOPDIR:=$(call OptFullPath,"$(JDK_TOPDIR)") ABS_HOTSPOT_TOPDIR:=$(call OptFullPath,"$(HOTSPOT_TOPDIR)") ABS_INSTALL_TOPDIR:=$(call OptFullPath,"$(INSTALL_TOPDIR)") ABS_SPONSORS_TOPDIR:=$(call OptFullPath,"$(SPONSORS_TOPDIR)") ABS_DEPLOY_TOPDIR:=$(call OptFullPath,"$(DEPLOY_TOPDIR)")
*** 152,161 **** --- 153,181 ---- else BUILD_JAXWS := $(JAXWS_SRC_AVAILABLE) endif endif + # If USE_SYSTEM_BDB is defined then simply ignore the bdb repo. + # If the bdb repo does not exist then set USE_SYSTEM_BDB + BDB_SRC_AVAILABLE := $(call MkExists,$(BDB_TOPDIR)/make/Makefile) + ifdef USE_SYSTEM_BDB + BUILD_BDB := false + USE_SYSTEM_BDB := true + else + ifndef BUILD_BDB + ifdef ALT_BDB_IMPORT_PATH + BUILD_BDB := false + else + BUILD_BDB := $(BDB_SRC_AVAILABLE) + ifeq ($(BUILD_BDB),false) + USE_SYSTEM_BDB := true + endif + endif + endif + endif + JDK_SRC_AVAILABLE := $(call MkExists,$(JDK_TOPDIR)/make/Makefile) ifndef BUILD_JDK BUILD_JDK := $(JDK_SRC_AVAILABLE) endif ifeq ($(JDK_SRC_AVAILABLE),true)
*** 289,298 **** --- 309,321 ---- endif # Output directory for hotspot build HOTSPOT_DIR = $(ABS_OUTPUTDIR)/hotspot + # Output directory for bdb build + BDB_DIR = $(ABS_OUTPUTDIR)/bdb + # If we are building components ifndef ALT_LANGTOOLS_DIST LANGTOOLS_OUTPUTDIR = $(ABS_OUTPUTDIR)/langtools ABS_LANGTOOLS_DIST = $(LANGTOOLS_OUTPUTDIR)/dist endif