[Fedora-directory-commits] ldapserver buildpaths.mk, 1.10, 1.11 nsarch, 1.6, 1.7 nsconfig.mk, 1.17, 1.18

[Doctor Conrad]

Author: rmeggins

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27647/ldapserver

Modified Files:
	buildpaths.mk nsarch nsconfig.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.  These changes are 
pretty much the same for adminutil, setuputil, adminserver, and ldapserver.

For ldapserver, I had to change nsarch (adminserver changed nsarch in a 
different way).  I also got rid of the 32 bit specific setup stuff.  I 
assume this was due to 32 bit NES admin server, so we can get rid of 
this for the future, because we will have all native 64 bit apps. I also 
went ahead and rolled in the gcc4 changes since they are safe for gcc3 
as well.



Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/buildpaths.mk,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- buildpaths.mk	10 Feb 2006 23:21:43 -0000	1.10
+++ buildpaths.mk	15 Feb 2006 22:53:45 -0000	1.11
@@ -71,10 +71,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: nsarch
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsarch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nsarch	19 Apr 2005 22:06:42 -0000	1.6
+++ nsarch	15 Feb 2006 22:53:45 -0000	1.7
@@ -607,6 +607,16 @@
 	  fi
           ns_printf
           exit 0
+	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported
emulations: elf_x86_64"; then
+	  #echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
+	  GNU_NAME="${UNAME_MACHINE}-unknown-linux"
+          NS_NAME="${UNAME_SYSTEM}"
+          NS_RELEASE="${UNAME_RELEASE}"
+	  if echo "$NS_RELEASE" | grep >/dev/null 2>&1 "2.0.";
then
+		NS_RELEASE="2.0"
+	  fi
+          ns_printf
+          exit 0
 	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported
emulations: i[345]86linux"; then
 	  #echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0
 	  GNU_NAME="${UNAME_MACHINE}-unknown-linuxaout"


Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsconfig.mk,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nsconfig.mk	16 Nov 2005 03:31:05 -0000	1.17
+++ nsconfig.mk	15 Feb 2006 22:53:45 -0000	1.18
@@ -256,8 +256,10 @@
 
 NSOS_TEST1       := $(shell uname -m)
 ifeq ($(NSOS_ARCH),Linux)
-  ifeq (86,$(findstring 86,$(NSOS_TEST1)))
-    NSOS_TEST1    = x86
+  ifneq (x86_64, $(NSOS_TEST1))
+    ifeq (86,$(findstring 86,$(NSOS_TEST1)))
+      NSOS_TEST1    = x86
+    endif
   endif
 
   ifeq ($(USE_LIBC),1)
@@ -273,8 +275,10 @@
   NSCONFIG_NOTAG  = $(NSCONFIG)
 else
   ifeq ($(NSOS_ARCH),RHEL)
-    ifeq (86,$(findstring 86,$(NSOS_TEST1)))
-      NSOS_TEST1    = x86
+    ifneq (x86_64, $(NSOS_TEST1))
+      ifeq (86,$(findstring 86,$(NSOS_TEST1)))
+        NSOS_TEST1    = x86
+      endif
     endif
     NSCONFIG        = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)_$(GCC_VERSION)
     NSCONFIG_NOTAG  = $(NSCONFIG)
@@ -297,6 +301,8 @@
       NSCONFIG_NOTAG   = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)
     endif
     endif
+    NSCONFIG += $(NS64TAG)
+    NSCONFIG_NOTAG += $(NS64TAG)
   endif
 endif
 
@@ -337,13 +343,9 @@
     NSOBJDIR_NAME_32     = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
   endif
 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     = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
+  NSOBJDIR_NAME_32  = $(subst $(NS64TAG),,$(NSOBJDIR_NAME))
+  NSOBJDIR_NAME1    = $(NSOBJDIR_NAME)
 endif
 
 
@@ -667,8 +669,8 @@
 else 
 ifeq ($(ARCH), Linux)
 OSVERSION	:= $(basename $(shell uname -r))
-CC=/usr/bin/gcc -fwritable-strings
-CXX=/usr/bin/g++ -fwritable-strings
+CC=/usr/bin/gcc
+CXX=/usr/bin/g++
 CCC=$(CXX)
 LD=$(CXX)
 ARCH_DEBUG=-g