[Fedora-directory-commits] setuputil buildpaths.mk, 1.1.1.1, 1.2 nsconfig.mk, 1.6, 1.7 nsdefs.mk, 1.5, 1.6

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27578/setuputil

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/setuputil/buildpaths.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- buildpaths.mk	29 Jul 2005 22:16:18 -0000	1.1.1.1
+++ buildpaths.mk	15 Feb 2006 22:51:00 -0000	1.2
@@ -58,10 +58,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$(NS64TAG)_,$(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$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
   else
     MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME)
   endif


Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/nsconfig.mk,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nsconfig.mk	1 Feb 2006 22:46:18 -0000	1.6
+++ nsconfig.mk	15 Feb 2006 22:51:00 -0000	1.7
@@ -47,37 +47,21 @@
 endif
 
 ifeq ($(NSOS_ARCH),Linux)
-  ifeq (86,$(findstring 86,$(NSOS_TEST1)))
-    ifeq (x86, $(findstring x86, $(NSOS_TEST1)))
-      NSOS_TMP := $(NSOS_TEST1)
-    else
-      NSOS_TMP    := x86
-    endif
-  else
-    NSOS_TMP    := $(NSOS_TEST1)
-  endif
   ifeq ($(USE_LIBC),1)
     LIBC_VERSION  = _libc
   else
     LIBC_VERSION  = _glibc
   endif
   PTHREAD_TAG   = _PTH
-  NSCONFIG        = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TMP)$(LIBC_VERSION)$(PTHREAD_TAG)
+  NSCONFIG        = $(NSOS_ARCH)$(NSOS_RELEASE)_$(CPU_ARCH)$(LIBC_VERSION)$(PTHREAD_TAG)
   NSCONFIG_NOTAG  = $(NSCONFIG)
-  NSOBJDIR_NAME     = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
+  NSOBJDIR_NAME   = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
 else
   ifeq ($(NSOS_ARCH),RHEL)
-    NSOS_TMP = $(NSOS_TEST1)
-    ifeq (86,$(findstring 86,$(NSOS_TMP)))
-      ifeq (x86, $(findstring x86, $(NSOS_TEST1)))
-        NSOS_TMP := $(NSOS_TEST1)
-      else
-        NSOS_TMP    := x86
-      endif
-    endif
     PTHREAD_TAG   = 
-    NSCONFIG        = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TMP)_$(GCC_VERSION)
+    NSCONFIG        = $(NSOS_ARCH)$(NSOS_RELEASE)_$(CPU_ARCH)_$(GCC_VERSION)
     NSCONFIG_NOTAG  = $(NSCONFIG)
+    NSOBJDIR_NAME     = $(NSCONFIG)$(PTHREAD_TAG)$(NSOBJDIR_TAG).OBJ
   else
     ifeq ($(NSOS_TEST1),i86pc)
       NSCONFIG         = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)
@@ -95,8 +79,8 @@
        NSOBJDIR_NAME     = $(NSCONFIG)$(NSOBJDIR_TAG).OBJD
       endif
     endif
+    NSOBJDIR_NAME     = $(NSCONFIG)$(NS64TAG)$(PTHREAD_TAG)$(NSOBJDIR_TAG).OBJ
   endif
-  NSOBJDIR_NAME     = $(NSCONFIG)$(NS64TAG)$(PTHREAD_TAG)$(NSOBJDIR_TAG).OBJ
 endif
 
 MAKE=gmake $(BUILDOPT) USE_PTHREADS=$(USE_PTHREADS) SECURITY=$(SECURITY) MOZILLA_SOURCE_ROOT_EXT=$(MOZILLA_SOURCE_ROOT_EXT) 
@@ -509,18 +493,12 @@
     NSOBJDIR_NAME     = $(NSCONFIG)$(PROCESSOR_ARCHITECTURE)$(NSOBJDIR_TAG).OBJ
     NSOBJDIR_NAME_32     = $(NSCONFIG)$(PROCESSOR_ARCHITECTURE)$(NSOBJDIR_TAG).OBJ
   else
-    NSOBJDIR_NAME     = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
-    NSOBJDIR_NAME_32     = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
+    NSOBJDIR_NAME_32     = $(subst $(NS64TAG),,$(NSOBJDIR_NAME))
   endif
   NSOBJDIR_NAME1    = $(NSOBJDIR_NAME)
 else
-  NSOBJDIR_NAME     = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
-  NSOBJDIR_NAME_32  = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
-  NSOBJDIR_NAME1    = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
-  NSOBJDIR_NAMEeh   = $(NSCONFIG)_eh$(NS64TAG)$(NSOBJDIR_TAG).OBJ
-  NSOBJDIR_NAMEaCC   = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
-  NSOBJDIR_NAME_NOTAG = $(NSCONFIG_NOTAG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
-  NSOBJDIR_NAME1_NOTAG = $(NSCONFIG_NOTAG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
+  NSOBJDIR_NAME_32  = $(subst $(NS64TAG),,$(NSOBJDIR_NAME))
+  NSOBJDIR_NAME1    = $(NSOBJDIR_NAME)
 endif
 # platforms without full rtl debugging versions of libraries i.e. not NT
 NSCP_DIST                         := $(ABS_ROOT_PARENT)/dist


Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/nsdefs.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nsdefs.mk	28 Jan 2006 02:33:14 -0000	1.5
+++ nsdefs.mk	15 Feb 2006 22:51:00 -0000	1.6
@@ -182,13 +182,15 @@
 	  NSOS_RELEASE := $(shell echo $(NSOS_RELEASE) | sed 's/\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/')
     endif
   endif
+  NSPLATFORM_DIR=$(NSOS_ARCH)$(NSOS_RELEASE)$(ARCHTYPE)
+else
+  NSPLATFORM_DIR=$(NSOS_ARCH)$(NSOS_RELEASE)$(ARCHTYPE)$(NS64TAG)
 endif
 
 ifdef BUILD_INTL
 INTL_DEF=-intl
 endif
 
-NSPLATFORM_DIR=$(NSOS_ARCH)$(NSOS_RELEASE)$(ARCHTYPE)$(NS64TAG)
 PLATFORM_DEST=$(NSOBJDIR_NAME)
 PLATFORM_OBJDIR=$(ABS_ROOT)/built/$(PLATFORM_DEST)
 PLATFORM_PACKAGE_DIR=$(ABS_ROOT)/built/package/$(PLATFORM_DEST)