[Fedora-directory-commits] adminutil buildpaths.mk, 1.1.1.1, 1.2 internal_comp_deps.mk, 1.1.1.1, 1.2 nsconfig.mk, 1.7, 1.8
Richard Allen Megginson (rmeggins)
fedora-directory-commits at redhat.com
Wed Feb 15 22:50:23 UTC 2006
- Previous message (by thread): [Fedora-directory-commits] ldapserver/ldap/servers/slapd/test-plugins testbind.c, 1.4.2.2, 1.4.2.3 testdatainterop.c, 1.4.2.2, 1.4.2.3 testentry.c, 1.4.2.2, 1.4.2.3 testextendedop.c, 1.4.2.2, 1.4.2.3 testgetip.c, 1.4.2.2, 1.4.2.3 testpostop.c, 1.4.2.2, 1.4.2.3 testpreop.c, 1.4.2.3, 1.4.2.4 testsaslbind.c, 1.6.2.2, 1.6.2.3
- Next message (by thread): [Fedora-directory-commits] setuputil buildpaths.mk, 1.1.1.1, 1.2 nsconfig.mk, 1.6, 1.7 nsdefs.mk, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rmeggins
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27551/adminutil
Modified Files:
buildpaths.mk internal_comp_deps.mk 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.
Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/buildpaths.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- buildpaths.mk 20 Jul 2005 22:51:30 -0000 1.1.1.1
+++ buildpaths.mk 15 Feb 2006 22:50:15 -0000 1.2
@@ -57,10 +57,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: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/internal_comp_deps.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- internal_comp_deps.mk 20 Jul 2005 22:51:31 -0000 1.1.1.1
+++ internal_comp_deps.mk 15 Feb 2006 22:50:15 -0000 1.2
@@ -146,7 +146,7 @@
# LDAP does not have PTH version, so here is the hack which treat non PTH
# version as PTH version
ifeq ($(USE_PTHREADS), 1)
- LDAP_RELEASE = $(LDAP_SBC)/$(LDAPCOMP_DIR)/$(LDAP_VERSION)/$(NSOBJDIR_NAME1)
+ LDAP_RELEASE = $(LDAP_SBC)/$(LDAPCOMP_DIR)/$(LDAP_VERSION)/$(NSOBJDIR_NAME)
else
LDAP_RELEASE = $(LDAP_SBC)/$(LDAPCOMP_DIR)/$(LDAP_VERSION)/$(LDAPOBJDIR)
endif
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/nsconfig.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nsconfig.mk 28 Jan 2006 02:29:52 -0000 1.7
+++ nsconfig.mk 15 Feb 2006 22:50:15 -0000 1.8
@@ -39,8 +39,12 @@
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)))
+ # if it's x86_64, just leave it - otherwise, convert iX86 to just x86
+ NSOS_TEST1 = x86
+ endif
endif
ifeq ($(USE_LIBC),1)
@@ -56,12 +60,11 @@
NSCONFIG_NOTAG = $(NSCONFIG)
else
ifeq ($(NSOS_ARCH),RHEL)
- ifeq (86,$(findstring 86,$(NSOS_TEST1)))
- NSOS_TEST1 = x86
- endif
- ifeq ($(USE_64), 1)
- NSOS_TEST2 := $(NSOS_TEST1)$(NS64TAG)
- NSOS_TEST1 := $(NSOS_TEST2)
+ ifneq (x86_64, $(NSOS_TEST1))
+ ifeq (86,$(findstring 86,$(NSOS_TEST1)))
+ # if it's x86_64, just leave it - otherwise, convert iX86 to just x86
+ NSOS_TEST1 = x86
+ endif
endif
NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)_$(GCC_VERSION)
NSCONFIG_NOTAG = $(NSCONFIG)
@@ -84,6 +87,9 @@
NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)
endif
endif
+# add _64 tag on all platforms except linux/rhel
+ NSCONFIG += $(NS64TAG)
+ NSCONFIG_NOTAG += $(NS64TAG)
endif
endif
@@ -469,17 +475,13 @@
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 = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
+ NSOBJDIR_NAME_32 = $(subst $(NS64TAG),,$(NSOBJDIR_NAME))
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_NAME_NOTAG = $(NSCONFIG_NOTAG)$(NSOBJDIR_TAG).OBJ
endif
# platforms without full rtl debugging versions of libraries i.e. not NT
NSCP_DIST := $(ABS_ROOT_PARENT)/dist
- Previous message (by thread): [Fedora-directory-commits] ldapserver/ldap/servers/slapd/test-plugins testbind.c, 1.4.2.2, 1.4.2.3 testdatainterop.c, 1.4.2.2, 1.4.2.3 testentry.c, 1.4.2.2, 1.4.2.3 testextendedop.c, 1.4.2.2, 1.4.2.3 testgetip.c, 1.4.2.2, 1.4.2.3 testpostop.c, 1.4.2.2, 1.4.2.3 testpreop.c, 1.4.2.3, 1.4.2.4 testsaslbind.c, 1.6.2.2, 1.6.2.3
- Next message (by thread): [Fedora-directory-commits] setuputil buildpaths.mk, 1.1.1.1, 1.2 nsconfig.mk, 1.6, 1.7 nsdefs.mk, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Fedora-directory-commits
mailing list