Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27613/adminserver
Modified Files:
buildpaths.mk nsconfig.mk nsdefs.mk
Log Message:
The correct naming convention for RHEL is
RHEL4_x86_64_gcc3_OPT.OBJ
The makefiles were assuming that if the string 86 was found in uname -m
it should use x86 for the arch. However, it should only do this if
uname -m is not x86_64. Also, for RHEL/Linux, we do not have to add the
NS64TAG just before the _OPT (or _DBG) since it's already in the arch.
Other platforms continue to use the other naming convention. The
default naming convention for the mozilla components is
Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ. I considered using Wan-Teh's
instructions about source builds, but that would cause many changes to
be made to our makefiles, so I just changed the way we calculate the
mozilla OBJDIR name from the regular OBJDIR name.
Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/buildpaths.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- buildpaths.mk 23 Nov 2005 01:25:45 -0000 1.5
+++ buildpaths.mk 15 Feb 2006 22:53:03 -0000 1.6
@@ -53,10 +53,10 @@
# subdir of mozilla/dist, and their naming convention is different than
# ours - we need to map ours to theirs
ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME)))
- MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst
RHEL3,Linux2.4,$(NSOBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(64BIT_TAG)_,$(subst
RHEL3,Linux2.4,$(NSOBJDIR_NAME)))
else
ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME)))
- MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst
RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(64BIT_TAG)_,$(subst
RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
else
MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME)
endif
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- nsconfig.mk 14 Feb 2006 04:26:28 -0000 1.23
+++ nsconfig.mk 15 Feb 2006 22:53:03 -0000 1.24
@@ -47,9 +47,13 @@
NSOS_TEST1 := $(shell uname -m)
-ifeq (86, $(findstring 86, $(NSOS_TEST1)))
- CPU_ARCH := x86
-else
+ifneq (x86_64, $(NSOS_TEST1))
+ ifeq (86, $(findstring 86, $(NSOS_TEST1)))
+ CPU_ARCH := x86
+ else
+ CPU_ARCH := $(NSOS_TEST1)
+ endif
+else
CPU_ARCH := $(NSOS_TEST1)
endif
Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsdefs.mk,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nsdefs.mk 1 Feb 2006 23:03:41 -0000 1.9
+++ nsdefs.mk 15 Feb 2006 22:53:03 -0000 1.10
@@ -180,6 +180,9 @@
GCC_VERSION = gcc$(word 1, $(shell gcc --version | sed 's/gcc.*GCC.\s//' |
sed 's/\..*//'))
endif
endif
+ NSPLATFORM_DIR=$(NSOS_ARCH)$(NSOS_RELEASE)$(ARCHTYPE)
+else
+ NSPLATFORM_DIR=$(NSOS_ARCH)$(NSOS_RELEASE)$(ARCHTYPE)$(64BIT_TAG)
endif
ifdef BUILD_INTL