[Fedora-directory-commits] ldapserver Makefile, 1.31, 1.32 component_versions.mk, 1.43, 1.44 components.mk, 1.44, 1.45 internal_buildpaths.mk, 1.8, 1.9 internal_comp_deps.mk, 1.38, 1.39 nsconfig.mk, 1.19, 1.20 nsperl.mk, 1.5, 1.6
Noriko Hosoi (nhosoi)
fedora-directory-commits at redhat.com
Mon Jun 19 17:39:09 UTC 2006
Author: nhosoi
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26597
Modified Files:
Makefile component_versions.mk components.mk
internal_buildpaths.mk internal_comp_deps.mk nsconfig.mk
nsperl.mk
Log Message:
[186642] Directory Server Makefile updates for Internal build (Comment #6)
1) picked up the latest components including Cyrus SASL, Perldap, SetupUtil,
and AdminServer
2) fixed the java paths for the internal build.
3) added an option -AA to HP-UX C++ compiler to adjust to SetupUtil build (use
libstd 2)
4) replaced <iostream.h>, <strstream.h> and <fstream.h> with <iostream>,
<strstream>, <fstream> respectively in ldap/cm/newinst/ux-dialog.cc
5) package svrcore and perldap, which were dropped in the current
ldap/cm/Makefile
6) added a perl script genPerlDAPInf.pl to generate perldap.inf file
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Makefile 29 Mar 2006 19:42:39 -0000 1.31
+++ Makefile 7 Apr 2006 01:33:30 -0000 1.32
@@ -199,17 +199,17 @@
brandDirectory: $(RELTOOLSPATH)/brandver.pl
@echo ==== Branding LDAP Server ==========
- $(RELTOOLSPATH)/brandver.pl -i branding/rhds/brandver.dat -s redhat-ds.spec
+ $(PERL) $(RELTOOLSPATH)/brandver.pl -i branding/rhds/brandver.dat -s redhat-ds.spec
@echo ==== Finished Branding LDAP Server ==========
versionDirectory: $(RELTOOLSPATH)/brandver.pl
@echo ==== Debranding LDAP Server ==========
- $(RELTOOLSPATH)/brandver.pl -i branding/fedora/brandver.dat -s fedora-ds.spec
+ $(PERL) $(RELTOOLSPATH)/brandver.pl -i branding/fedora/brandver.dat -s fedora-ds.spec
@echo ==== Finished Debranding LDAP Server ==========
normalizeDirectory: $(RELTOOLSPATH)/brandver.pl
@echo ==== Normalizing LDAP Server ==========
- $(RELTOOLSPATH)/brandver.pl -i branding/fedora/normalize.dat -s redhat-ds.spec
+ $(PERL) $(RELTOOLSPATH)/brandver.pl -i branding/fedora/normalize.dat -s redhat-ds.spec
@echo ==== Normalizing Branding LDAP Server ==========
buildAndPkgDirectory: buildDirectory pkgDirectory
Index: component_versions.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/component_versions.mk,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- component_versions.mk 29 Mar 2006 19:42:39 -0000 1.43
+++ component_versions.mk 7 Apr 2006 01:33:30 -0000 1.44
@@ -63,10 +63,10 @@
# LIBDB
DBDEFS:=
ifndef DB_MAJOR_MINOR
-DB_MAJOR_MINOR:=db42
+DB_MAJOR_MINOR:=db-4.2
endif
ifndef DB_VERSION
- DB_VERSION:=20040813
+ DB_VERSION:=20060308
endif
# SMARTHEAP
@@ -109,7 +109,7 @@
# admin server
ifndef ADM_RELDATE
- ADM_RELDATE = 20060328
+ ADM_RELDATE = 20060405
endif
ifndef ADM_VERSDIR
ADM_VERSDIR = adminserver/1.0
@@ -122,7 +122,7 @@
# setuputil
ifndef SETUPUTIL_RELDATE
- SETUPUTIL_RELDATE = 20060327
+ SETUPUTIL_RELDATE = 20060405
endif
ifndef SETUPUTIL_VER
SETUPUTIL_VER = 10
@@ -166,7 +166,7 @@
endif
ifndef PERLDAP_VERSION
- PERLDAP_VERSION=1.5/20051028
+ PERLDAP_VERSION=1.5/20060331
endif
ifndef JSS_COMP
@@ -185,7 +185,7 @@
SASL_VERSDIR=cyrus
endif
ifndef SASL_RELDATE
- SASL_RELDATE=v2.1.20
+ SASL_RELDATE=v2.1.20.1
endif
# jakarta/axis for DSMLGW
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- components.mk 29 Mar 2006 19:42:39 -0000 1.44
+++ components.mk 7 Apr 2006 01:33:30 -0000 1.45
@@ -194,7 +194,8 @@
SECURITY_INCLUDE = -I$(SECURITY_INCDIR)
# add crlutil and ocspclnt when we support CRL and OCSP cert checking in DS
SECURITY_BINNAMES = certutil derdump pp pk12util ssltap modutil shlibsign
-SECURITY_LIBNAMES = ssl3 nss3 softokn3
+# as of NSS 3.11, no longer need to link with softokn3
+SECURITY_LIBNAMES = ssl3 nss3
# these libs have a corresponding .chk file
SECURITY_NEED_CHK = softokn3
@@ -359,7 +360,7 @@
SASL_INCDIR = $(SASL_SOURCE_ROOT)/include/sasl
else
SASL_LIBPATH = $(SASL_BUILD_DIR)/lib
- SASL_INCDIR = $(SASL_BUILD_DIR)/include
+ SASL_INCDIR = $(SASL_BUILD_DIR)/include/sasl
endif
endif
SASL_INCLUDE = $(SASL_INCDIR)
Index: internal_buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_buildpaths.mk,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- internal_buildpaths.mk 29 Oct 2005 02:21:40 -0000 1.8
+++ internal_buildpaths.mk 7 Apr 2006 01:33:30 -0000 1.9
@@ -118,11 +118,10 @@
#DB_SOURCE_ROOT = $(BUILD_ROOT)/../db-4.2.52.NC
# DB_MAJOR_MINOR is the root name for the db shared library
-# source builds use db-4.2 - uncomment this if using source
-#DB_MAJOR_MINOR := db-4.2
+DB_MAJOR_MINOR := db-4.2
ifndef DB_SOURCE_ROOT
-DB_MAJOR_MINOR := db42
-db_component_name=$(DB_MAJOR_MINOR)
+# db_component_name is the dir name in /s/b/c
+db_component_name=db42
db_path_config :=$(NSCP_DISTDIR)/$(db_component_name)
endif # DB_SOURCE_ROOT
Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- internal_comp_deps.mk 29 Mar 2006 19:42:39 -0000 1.38
+++ internal_comp_deps.mk 7 Apr 2006 01:33:30 -0000 1.39
@@ -176,7 +176,7 @@
ifndef SASL_SOURCE_ROOT
ifneq ($(ARCH), Linux)
-SASL_RELEASE = $(COMPONENTS_DIR)/sasl/$(SASL_VERSDIR)/$(SASL_RELDATE)/$(NSOBJDIR_NAME)
+SASL_RELEASE = $(COMPONENTS_DIR_DEV)/sasl/$(SASL_VERSDIR)/$(SASL_RELDATE)/$(NSOBJDIR_NAME)
SASL_DEP = $(SASL_INCLUDE)/sasl.h
ifndef SASL_PULL_METHOD
SASL_PULL_METHOD = $(COMPONENT_PULL_METHOD)
@@ -216,10 +216,11 @@
ifndef DB_SOURCE_ROOT
#if no version specified, we'll use the latest one
ifndef DB_VERSION
- DB_VERSION=20040130
+ DB_VERSION=20060308
endif
# define the paths to the component parts
-db_components_share=$(COMPONENTS_DIR)/$(db_component_name)
+#db_components_share=$(COMPONENTS_DIR)/$(db_component_name)
+db_components_share=$(COMPONENTS_DIR_DEV)/$(db_component_name)
MY_NSOBJDIR_TAG=$(NSOBJDIR_TAG).OBJ
db_release_config =$(db_components_share)/$(DB_VERSION)/$(NSCONFIG_NOTAG)$(MY_NSOBJDIR_TAG)
# add ",bin" to DB_FILES if you want the programs like db_verify, db_recover, etc.
@@ -508,7 +509,18 @@
#PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR_DEV)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32)
ifeq ($(BUILD_MODE), int)
-PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR_DEV)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32)
+ PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR_DEV)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32)
+ ifeq ($(BUILD_ARCH), RHEL4)
+ # use 64-bit perl on 64-bit RHEL4; 32-bit on 32-bit RHEL4
+ PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR_DEV)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME)
+ endif
+ ifeq ($(BUILD_ARCH), HPUX)
+ HPUX_ARCH := $(shell uname -m)
+ ifeq ($(HPUX_ARCH), ia64)
+ # use 64-bit perl on 64-bit IPF HP-UX
+ PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR_DEV)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME)
+ endif
+ endif
else
PERLDAP_COMPONENT_DIR = $(FED_COMPONENTS_DIR)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32)
endif
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsconfig.mk,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- nsconfig.mk 28 Feb 2006 21:51:21 -0000 1.19
+++ nsconfig.mk 7 Apr 2006 01:33:30 -0000 1.20
@@ -67,6 +67,7 @@
USE_DSGW:=1
USE_JAVATOOLS:=1
USE_SETUPUTIL:=1
+ USE_PERLDAP:=1
else
USE_ADMINSERVER:=1
USE_CONSOLE:=1
@@ -75,6 +76,7 @@
USE_DSGW:=1
USE_JAVATOOLS:=1
USE_SETUPUTIL:=1
+ USE_PERLDAP:=1
GET_JAVA_FROM_PATH := 1
GET_ANT_FROM_PATH := 1
USE_PERL_FROM_PATH := 1
@@ -532,13 +534,15 @@
CC=cc -Ae -D_POSIX_C_SOURCE=199506L
ifeq ($(BUILD_MODULE), HTTP_ADMIN)
ifeq ($(NSOS_RELEASE),B.11.23)
-CXX=aCC -AP -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L -ext
+# -AA -- new-lib libstd 2
+CXX=aCC -AA -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L -ext
else
CXX=aCC -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L -ext
endif
else
ifeq ($(NSOS_RELEASE),B.11.23)
-CXX=aCC -AP -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L -ext
+# -AA -- new-lib libstd 2
+CXX=aCC -AA -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L -ext
else
CXX=aCC -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L -ext
endif
Index: nsperl.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsperl.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nsperl.mk 21 Oct 2005 19:21:04 -0000 1.5
+++ nsperl.mk 7 Apr 2006 01:33:30 -0000 1.6
@@ -41,7 +41,7 @@
NSPERL_RELDATE := 20020626
# default; will be redefined below for specific platform
#PERL=$(NSPERL_COMPONENT_DIR)/lib/$(NSPERL_VERSION)/nsperl
-PERL=/share/builds/sbstools/nsPerl/$(NSPERL_RELDATE)/$(NSOBJDIR_NAME_32)/nsperl
+PERL=perl
ifeq ($(BUILD_ARCH), WINNT)
PERL=nsperl
endif
More information about the Fedora-directory-commits
mailing list