diff options
| author | Noriko Hosoi <nhosoi@redhat.com> | 2006-02-28 03:00:14 +0000 |
|---|---|---|
| committer | Noriko Hosoi <nhosoi@redhat.com> | 2006-02-28 03:00:14 +0000 |
| commit | 2ab1b4d64d3d2a718bade5161c2ec2c834111f7b (patch) | |
| tree | 7458e68e56824d534f349c87bc51c3c23caeee16 /internal_comp_deps.mk | |
| parent | 0402bb5e22f9c422ce2942d0c07735aee76fe1f4 (diff) | |
| download | ds-2ab1b4d64d3d2a718bade5161c2ec2c834111f7b.tar.gz ds-2ab1b4d64d3d2a718bade5161c2ec2c834111f7b.tar.xz ds-2ab1b4d64d3d2a718bade5161c2ec2c834111f7b.zip | |
Fixing nightly build
Changes:
1) NSPR_RELDATE: v4.6.1 --> v4.6
2) ICU_LIB_VERSION: 34 --> 24
This is a temporary degrade to adjust the version to match the one in adminutil.Once adminutil is built with icu 3.4 and pushed to /s/b/c, we'd go back to 3.4.
3) lib/base/systhr.cpp: Applied NSPR sysfd table patch
4) DS version: 7.1 --> 7.2
Diffstat (limited to 'internal_comp_deps.mk')
| -rw-r--r-- | internal_comp_deps.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/internal_comp_deps.mk b/internal_comp_deps.mk index 7b437da0..7889255a 100644 --- a/internal_comp_deps.mk +++ b/internal_comp_deps.mk @@ -273,6 +273,7 @@ endif # SASL_SOURCE_ROOT ifndef ICU_SOURCE_ROOT ICU_RELEASE = $(COMPONENTS_DIR)/libicu/$(ICU_VERSDIR)/$(ICU_RELDATE)/$(NSOBJDIR_NAME) +#ICU_RELEASE = $(COMPONENTS_DIR_DEV)/libicu/$(ICU_VERSDIR)/$(ICU_RELDATE)/$(NSOBJDIR_NAME) ICU_DEP = $(ICU_INCPATH)/unicode/ucol.h ifndef ICU_PULL_METHOD ICU_PULL_METHOD = $(COMPONENT_PULL_METHOD) @@ -330,8 +331,8 @@ endif # DB_SOURCE_ROOT ADMINUTIL_VERSION=$(ADMINUTIL_RELDATE) ADMINUTIL_BASE=$(ADMINUTIL_VERSDIR)/${ADMINUTIL_VERSION} ifeq ($(BUILD_MODE), int) - ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) -# ADMINUTIL_IMPORT=$(COMPONENTS_DIR_DEV)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) +# ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) + ADMINUTIL_IMPORT=$(COMPONENTS_DIR_DEV)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) else # ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) ADMINUTIL_IMPORT=$(FED_COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME) @@ -501,7 +502,7 @@ ifeq ($(BUILD_JAVA_CODE),1) ifndef GET_ANT_FROM_PATH # (we use ant for building some Java code) ANTJAR = ant.jar -JAXPJAR = jaxp.jar +#JAXPJAR = jaxp.jar # ??? ANT_FILES = $(ANTJAR) $(JAXPJAR) ANT_RELEASE = $(COMPONENTS_DIR) ANT_HOME = $(ANT_RELEASE)/$(ANT_COMP)/$(ANT_VERSION) |