[Fedora-directory-commits] adminutil buildpaths.mk, 1.2, 1.3 nsconfig.mk, 1.8, 1.9
Richard Allen Megginson (rmeggins)
fedora-directory-commits at redhat.com
Fri Feb 17 15:00:00 UTC 2006
Author: rmeggins
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv629
Modified Files:
buildpaths.mk nsconfig.mk
Log Message:
1) Fix moz objdir name for generic linux x86_64
2) Allow moz objdir name to be passed in
3) append _64 tag to objdir name directly rather than via +=
Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/buildpaths.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- buildpaths.mk 15 Feb 2006 22:50:15 -0000 1.2
+++ buildpaths.mk 17 Feb 2006 14:59:52 -0000 1.3
@@ -52,18 +52,25 @@
else
MOZILLA_SOURCE_ROOT = $(BUILD_ROOT)/../mozilla
endif
+
ifdef MOZILLA_SOURCE_ROOT
- # some of the mozilla components are put in a platform/buildtype specific
- # 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$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME)))
- else
- ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME)))
- MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
- else
- MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME)
- endif
+ ifndef MOZ_OBJDIR_NAME
+ # some of the mozilla components are put in a platform/buildtype specific
+ # 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$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME)))
+ else
+ ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
+ else
+ ifneq (,$(findstring Linux,$(NSOBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _glibc_PTH_,_glibc_PTH$(NS64TAG)_,$(NSOBJDIR_NAME))
+ else
+ MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME)
+ endif
+ endif
+ endif
endif
endif
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/nsconfig.mk,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nsconfig.mk 15 Feb 2006 22:50:15 -0000 1.8
+++ nsconfig.mk 17 Feb 2006 14:59:52 -0000 1.9
@@ -69,27 +69,25 @@
NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)_$(GCC_VERSION)
NSCONFIG_NOTAG = $(NSCONFIG)
else
+# add _64 tag on all platforms except linux/rhel
ifeq ($(NSOS_ARCH),HP-UX)
NSOS_TEST1 := $(shell uname -m)
ifeq ($(NSOS_TEST1), ia64)
- NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)
- NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)
+ NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)$(NS64TAG)
+ NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)$(NS64TAG)
else
- NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)
- NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)
+ NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)$(NS64TAG)
+ NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)$(NS64TAG)
endif
else
ifeq ($(NSOS_TEST1),i86pc)
- NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)
- NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)
+ NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)$(NS64TAG)
+ NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)$(NS64TAG)
else
- NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)
- NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)
+ NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)$(NS64TAG)
+ NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)$(NS64TAG)
endif
endif
-# add _64 tag on all platforms except linux/rhel
- NSCONFIG += $(NS64TAG)
- NSCONFIG_NOTAG += $(NS64TAG)
endif
endif
More information about the Fedora-directory-commits
mailing list