[Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.13, 1.30.2.14
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2069
Modified Files:
Tag: Directory71RtmBranch
Makefile
Log Message:
Fix for the Solaris and HP-UX patch packaging
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.30.2.13
retrieving revision 1.30.2.14
diff -u -r1.30.2.13 -r1.30.2.14
--- Makefile 15 Feb 2006 21:32:27 -0000 1.30.2.13
+++ Makefile 17 Feb 2006 01:16:22 -0000 1.30.2.14
@@ -713,7 +713,14 @@
fi
ifdef BUILD_PATCH
-# copying a file from the component area
+# take care of files in components (e.g., a file in nsadmin.zip)
+ -@for pair in `grep "^compfile:" $(PATCHINF) | awk '{print $$3}'`; do \
+ zipfile=`echo $$pair | awk -F: '{print $$1}' | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \
+ afile=`echo $$pair | awk -F: '{print $$2}'` ; \
+ cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); $(UNZIP) -o $$zipfile $$afile ; \
+ done
+
+# copying files from the component area
-@for pair in `grep "^copyfile:" $(PATCHINF) | awk '{print $$3}'`; do \
zipfile=`echo $$pair | awk -F: '{print $$1}'` ; \
sfile=`echo $$pair | awk -F: '{print $$2}' | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \
18 years, 2 months
[Fedora-directory-commits] setuputil/installer/unix/lib Makefile, 1.3, 1.4
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/setuputil/installer/unix/lib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27855
Modified Files:
Makefile
Log Message:
Added a space to an addprefix call that was randomly failing on FC4 x86_64
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/setuputil/installer/unix/lib/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile 28 Jan 2006 02:33:25 -0000 1.3
+++ Makefile 16 Feb 2006 23:57:54 -0000 1.4
@@ -36,7 +36,7 @@
STAGE=$(OBJDIR)/$(DIR)
-OBJS=$(addprefix $(OBJDEST)/,ux-util.o ux-curse.o dialog.o ux-wrapper.o)
+OBJS=$(addprefix $(OBJDEST)/, ux-util.o ux-curse.o dialog.o ux-wrapper.o)
INCS=ux-util.h dialog.h
LIBS=$(LIBDEST)/libinstall.a
18 years, 2 months
[Fedora-directory-commits] adminserver nsdefs.mk,1.10,1.11
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23359
Modified Files:
nsdefs.mk
Log Message:
NSPLATFORM_DIR is set differently for linux than for other platforms
Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsdefs.mk,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nsdefs.mk 15 Feb 2006 22:53:03 -0000 1.10
+++ nsdefs.mk 16 Feb 2006 22:22:22 -0000 1.11
@@ -189,7 +189,6 @@
INTL_DEF=-intl
endif
-NSPLATFORM_DIR=$(NSOS_ARCH)$(NSOS_RELEASE)$(ARCHTYPE)$(64BIT_TAG)
PLATFORM_DEST=$(NSOBJDIR_NAME)
PLATFORM_OBJDIR=$(BUILD_ROOT)/built/$(PLATFORM_DEST)
PLATFORM_PACKAGE_DIR=$(BUILD_ROOT)/built/package/$(PLATFORM_DEST)
18 years, 2 months
[Fedora-directory-commits] dsbuild/meta/ds Makefile,1.2,1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/meta/ds
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/dsbuild/meta/ds
Modified Files:
Makefile
Log Message:
use given name for moz objdir naming
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/meta/ds/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 14 Feb 2006 22:30:05 -0000 1.2
+++ Makefile 16 Feb 2006 21:34:15 -0000 1.3
@@ -7,6 +7,11 @@
override DEBUG=full
endif
+ARCH=$(shell uname -m)
+ifeq ($(ARCH), x86_64)
+ USE_64=1
+endif
+
LIBDEPS = ds/mozilla ds/icu ds/adminutil ds/setuputil ds/mod_nss ds/mod_admserv ds/mod_restartd
ifndef NOJAVA
18 years, 2 months
[Fedora-directory-commits] dsbuild/ds/setuputil Makefile,1.2,1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/dsbuild/ds/setuputil
Modified Files:
Makefile
Log Message:
use given name for moz objdir naming
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/setuputil/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 14 Feb 2006 22:30:00 -0000 1.2
+++ Makefile 16 Feb 2006 21:34:09 -0000 1.3
@@ -1,3 +1,5 @@
+include ../../objdirname.mk
+
GARNAME = fedora-setuputil
GARVERSION = 1.0.2
CATEGORIES = ds
@@ -12,12 +14,12 @@
BUILD_SCRIPTS = $(WORKSRC)/Makefile
#INSTALL_SCRIPTS = $(WORKSRC)/Makefile
INSTALL_SCRIPTS = custom
-BUILD_ARGS = USE_PERL_FROM_PATH=1 MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla
+BUILD_ARGS = USE_PERL_FROM_PATH=1 MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla MOZ_OBJDIR_NAME=$(MOZ_OBJDIR_NAME)
-ifndef DEBUG
-BUILD_ARGS += BUILD_DEBUG=optimize
-else
+ifeq ($(DEBUG), full)
BUILD_ARGS += DEBUG=full
+else
+BUILD_ARGS += BUILD_DEBUG=optimize
endif
configure-custom:
18 years, 2 months
[Fedora-directory-commits] dsbuild/ds/mozilla Makefile,1.2,1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/mozilla
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/dsbuild/ds/mozilla
Modified Files:
Makefile
Log Message:
use given name for moz objdir naming
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/mozilla/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 14 Feb 2006 22:29:29 -0000 1.2
+++ Makefile 16 Feb 2006 21:34:04 -0000 1.3
@@ -18,11 +18,19 @@
ifndef DEBUG
OPTFLAG="BUILD_OPT=1"
-CONFIGFLAG=--disable-debug --enable-optimize
+CONFIGURE_OPTS=--disable-debug --enable-optimize
+OBJDIR=OPT.OBJ
else
-CONFIGFLAG=--enable-debug --disable-optimize
+CONFIGURE_OPTS=--enable-debug --disable-optimize
+OBJDIR=DBG.OBJ
endif
+ifeq ($(USE_64), 1)
+CONFIGURE_OPTS += --enable-64bit
+endif
+
+NSPR_PREFIX=$(ABS_GARDIR)/$(CATEGORIES)/$(GARNAME)/work/mozilla/dist/$(OBJDIR)
+
# this is our "custom" patch target
post-patch:
ifdef MYPATCH
@@ -36,13 +44,35 @@
$(MAKECOOKIE)
build-custom:
- cd work/mozilla/security/nss && $(MAKE) nss_build_all $(OPTFLAG)
- cd work/mozilla/security/svrcore && $(MAKE) $(OPTFLAG)
- cd work/mozilla/directory/c-sdk && ./configure --with-svrcore $(CONFIGFLAG)
+# first, build coreconf
+ $(MAKE) -C work/mozilla/security/coreconf OBJDIR_NAME=$(OBJDIR)
+
+# next, configure and make nspr
+ mkdir -p work/mozilla/dist/$(OBJDIR)
+ mkdir -p work/mozilla/nsprpub/$(OBJDIR)
+ cd work/mozilla/nsprpub/$(OBJDIR) && sh ../configure $(CONFIGURE_OPTS) \
+ --with-dist-prefix='$(NSPR_PREFIX)' \
+ --with-dist-includedir='$(NSPR_PREFIX)/include'
+
+ $(MAKE) -C work/mozilla/nsprpub/$(OBJDIR)
+
+# next, make dbm
+ $(MAKE) -C work/mozilla/security/dbm OBJDIR_NAME=$(OBJDIR) export libs
+
+# next, make nss
+ $(MAKE) -C work/mozilla/security/nss $(OPTFLAG) OBJDIR_NAME=$(OBJDIR) all
+# $(MAKE) -C work/mozilla/security/nss nss_build_all $(OPTFLAG)
+
+# next, make svrcore
+ cd work/mozilla/security/svrcore && $(MAKE) $(OPTFLAG) OBJDIR_NAME=$(OBJDIR)
+
+# next, configure and make the ldap c sdk
+ cd work/mozilla/directory/c-sdk && ./configure --with-svrcore $(CONFIGURE_OPTS)
cd work/mozilla/directory/c-sdk && $(MAKE) BUILDCLU=1 HAVE_SVRCORE=1 $(OPTFLAG)
+
# perldap uses MakeMaker, so lots of env. vars.
cd work/mozilla/directory/perldap && \
- LDAPSDKDIR=/opt/mozldap LDAPSDKSSL=yes NSPRDIR=`echo ../../dist/*.OBJ` perl Makefile.PL && \
+ LDAPSDKDIR=/opt/mozldap LDAPSDKSSL=yes NSPRDIR=../../dist/$(OBJDIR) perl Makefile.PL && \
$(MAKE) LD_RUN_PATH=/opt/fedora-ds/shared/lib
$(MAKECOOKIE)
18 years, 2 months
[Fedora-directory-commits] dsbuild/ds/ldapserver Makefile,1.3,1.4
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/dsbuild/ds/ldapserver
Modified Files:
Makefile
Log Message:
use given name for moz objdir naming
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile 15 Feb 2006 22:55:46 -0000 1.3
+++ Makefile 16 Feb 2006 21:33:58 -0000 1.4
@@ -21,6 +21,7 @@
INSTALL_SCRIPTS = custom
BUILD_ARGS = INSTDIR=$(PKGDIR) USE_PERL_FROM_PATH=1 BUILD_RPM=$(BUILD_RPM) \
MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla \
+ MOZ_OBJDIR_NAME=$(MOZ_OBJDIR_NAME) \
ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 \
ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.2 \
SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0.2 \
18 years, 2 months
[Fedora-directory-commits] dsbuild/ds/adminutil Makefile,1.2,1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/dsbuild/ds/adminutil
Modified Files:
Makefile
Log Message:
use given name for moz objdir naming
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/adminutil/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 14 Feb 2006 22:28:25 -0000 1.2
+++ Makefile 16 Feb 2006 21:33:53 -0000 1.3
@@ -1,3 +1,5 @@
+include ../../objdirname.mk
+
GARNAME = fedora-adminutil
GARVERSION = 1.0.2
CATEGORIES = ds
@@ -12,12 +14,12 @@
BUILD_SCRIPTS = $(WORKSRC)/Makefile
#INSTALL_SCRIPTS = $(WORKSRC)/Makefile
INSTALL_SCRIPTS = custom
-BUILD_ARGS = BUILD_RPM= MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4
+BUILD_ARGS = BUILD_RPM= MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 MOZ_OBJDIR_NAME=$(MOZ_OBJDIR_NAME)
-ifndef DEBUG
-BUILD_ARGS += BUILD_DEBUG=optimize
-else
+ifeq ($(DEBUG), full)
BUILD_ARGS += DEBUG=full
+else
+BUILD_ARGS += BUILD_DEBUG=optimize
endif
configure-custom:
18 years, 2 months
[Fedora-directory-commits] dsbuild/ds/adminserver Makefile,1.2,1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/dsbuild/ds/adminserver
Modified Files:
Makefile
Log Message:
use given name for moz objdir naming
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/adminserver/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 14 Feb 2006 22:28:18 -0000 1.2
+++ Makefile 16 Feb 2006 21:33:47 -0000 1.3
@@ -1,3 +1,5 @@
+include ../../objdirname.mk
+
GARNAME = fedora-adminserver
GARVERSION = 1.0.2
CATEGORIES = ds
@@ -14,6 +16,7 @@
INSTALL_SCRIPTS = custom
BUILD_ARGS = MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla \
+ MOZ_OBJDIR_NAME=$(MOZ_OBJDIR_NAME) \
ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 \
ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.2 \
SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0.2 \
@@ -27,7 +30,7 @@
BUILD_ARGS += CONSOLE_SOURCE_DIR=$(ABS_GARDIR)/$(CATEGORIES)/console/work
endif # NOJAVA
-ifndef DEBUG
+ifneq ($(DEBUG), full)
BUILD_ARGS += BUILD_DEBUG=optimize
endif
18 years, 2 months
[Fedora-directory-commits] dsbuild objdirname.mk,1.2,1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/dsbuild
Modified Files:
objdirname.mk
Log Message:
use given name for moz objdir naming
Index: objdirname.mk
===================================================================
RCS file: /cvs/dirsec/dsbuild/objdirname.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- objdirname.mk 15 Feb 2006 22:55:40 -0000 1.2
+++ objdirname.mk 16 Feb 2006 21:33:42 -0000 1.3
@@ -134,8 +134,10 @@
ifeq ($(DEBUG), full)
NSOBJDIR_TAG=_DBG
+ MOZ_OBJDIR_NAME=DBG.OBJ
else
NSOBJDIR_TAG=_OPT
+ MOZ_OBJDIR_NAME=OPT.OBJ
endif
ifeq ($(NSOS_ARCH),WINNT)
@@ -148,14 +150,20 @@
endif
# Mozilla uses a slightly different naming convention
-ifneq (,$(findstring RHEL3,$(OBJDIR_NAME)))
- MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(OBJDIR_NAME)))
-else
-ifneq (,$(findstring RHEL4,$(OBJDIR_NAME)))
- MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(OBJDIR_NAME)))
-else
- MOZ_OBJDIR_NAME = $(OBJDIR_NAME)
-endif
+ifndef MOZ_OBJDIR_NAME
+ ifneq (,$(findstring RHEL3,$(OBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(OBJDIR_NAME)))
+ else
+ ifneq (,$(findstring RHEL4,$(OBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(OBJDIR_NAME)))
+ else
+ ifneq (,$(findstring Linux,$(NSOBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _glibc_PTH_,_glibc_PTH$(NS64TAG)_,$(NSOBJDIR_NAME))
+ else
+ MOZ_OBJDIR_NAME = $(OBJDIR_NAME)
+ endif
+ endif
+ endif
endif
# figure out which imports file to use - for console builds
18 years, 2 months