[Fedora-directory-commits] setuputil nsarch, 1.1.1.1, 1.2 nsconfig.mk, 1.2, 1.3
Author: nhosoi
Update of /cvs/dirsec/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20150
Modified Files:
nsarch nsconfig.mk
Log Message:
[Bug 175900] SetupUtil build (64-bit)
1) nsarch supports 64-bit ld output. (copied from adminutil)
2) modified CPU_ARCH value to pick up the right mozilla components.
Index: nsarch
===================================================================
RCS file: /cvs/dirsec/setuputil/nsarch,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- nsarch 29 Jul 2005 22:16:18 -0000 1.1.1.1
+++ nsarch 16 Dec 2005 01:07:51 -0000 1.2
@@ -1,20 +1,19 @@
#! /bin/sh
#
# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
-#
+#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation version
# 2.1 of the License.
-#
+#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
-#
+#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
@@ -178,7 +177,7 @@
#--------------------------------------------------------------------------
# everything that follows is GNU's config.guess slightly modified
-# for internal use
+# for our use
# NT doesn't have /dev/null
#UNAME_MACHINE=`(uname -m) 2> /dev/null` || UNAME_MACHINE=unknown
@@ -571,7 +570,7 @@
# The BFD linker knows what the default object file format is, so
# first see if it will tell us.
ld_help_string=`ld --help 2>&1`
- if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported
emulations: elf_i[345]86"; then
+ if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported
emulations: .* elf_i[345]86"; then
#echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
GNU_NAME="${UNAME_MACHINE}-unknown-linux"
NS_NAME="${UNAME_SYSTEM}"
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/nsconfig.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nsconfig.mk 9 Nov 2005 01:56:12 -0000 1.2
+++ nsconfig.mk 16 Dec 2005 01:07:52 -0000 1.3
@@ -31,7 +31,11 @@
NSOS_TEST1 := $(shell uname -m)
ifeq (86, $(findstring 86, $(NSOS_TEST1)))
- CPU_ARCH := x86
+ ifeq (x86, $(findstring x86, $(NSOS_TEST1)))
+ CPU_ARCH := $(NSOS_TEST1)
+ else
+ CPU_ARCH := x86
+ endif
else
CPU_ARCH := $(NSOS_TEST1)
endif
@@ -44,9 +48,13 @@
ifeq ($(NSOS_ARCH),Linux)
ifeq (86,$(findstring 86,$(NSOS_TEST1)))
- NSOS_TMP := x86
+ ifeq (x86, $(findstring x86, $(NSOS_TEST1)))
+ NSOS_TMP := $(NSOS_TEST1)
+ else
+ NSOS_TMP := x86
+ endif
else
- NSOS_TMP := $(NSOS_TEST1)
+ NSOS_TMP := $(NSOS_TEST1)
endif
ifeq ($(USE_LIBC),1)
LIBC_VERSION = _libc
@@ -56,12 +64,16 @@
PTHREAD_TAG = _PTH
NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TMP)$(LIBC_VERSION)$(PTHREAD_TAG)
NSCONFIG_NOTAG = $(NSCONFIG)
- NSOBJDIR_NAME = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
+ NSOBJDIR_NAME = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
else
ifeq ($(NSOS_ARCH),RHEL)
NSOS_TMP = $(NSOS_TEST1)
ifeq (86,$(findstring 86,$(NSOS_TMP)))
- NSOS_TMP = x86
+ 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)