[Fedora-directory-commits] adminutil nsarch, 1.1.1.1, 1.2 nsconfig.mk, 1.4, 1.5 nsdefs.mk, 1.4, 1.5 nsperl.mk, 1.2, 1.3 pumpkin.pl, 1.1.1.1, 1.2

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11019

Modified Files:
	nsarch nsconfig.mk nsdefs.mk nsperl.mk pumpkin.pl 
Log Message:
[172166] Admin Util build (64-bit)
1) nsarch does not run well since the output of 'ld --help' did not match the
given regular expression.
2) added "_64" to the NSCONFIG macro to pick up the mozilla components.
3) added version number to the ident string
4) replaced 'perl <perlprogram>' with '/usr/bin/env perl <perlprogram>'
5) cleaned up warning message from gcc



Index: nsarch
===================================================================
RCS file: /cvs/dirsec/adminutil/nsarch,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- nsarch	20 Jul 2005 22:51:31 -0000	1.1.1.1
+++ nsarch	15 Dec 2005 21:06:22 -0000	1.2
@@ -570,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/adminutil/nsconfig.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsconfig.mk	6 Dec 2005 18:38:20 -0000	1.4
+++ nsconfig.mk	15 Dec 2005 21:06:22 -0000	1.5
@@ -59,6 +59,10 @@
     ifeq (86,$(findstring 86,$(NSOS_TEST1)))
       NSOS_TEST1    = x86
     endif
+    ifeq ($(USE_64), 1)
+      NSOS_TEST2   := $(NSOS_TEST1)$(NS64TAG)
+      NSOS_TEST1   := $(NSOS_TEST2)
+    endif
     NSCONFIG        = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)_$(GCC_VERSION)
     NSCONFIG_NOTAG  = $(NSCONFIG)
   else


Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/nsdefs.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsdefs.mk	16 Nov 2005 18:49:58 -0000	1.4
+++ nsdefs.mk	15 Dec 2005 21:06:22 -0000	1.5
@@ -188,13 +188,7 @@
   UNZIP = $(ZIPDIR)/unzip.exe -o
 
 else
-  ifeq ($(BUILD_ARCH), Linux)
-#PERL=$(COMPONENTS_DIR)/perl5/$(PKG_ARCH)2.1-perl5/perl
-    PERL=perl
-  else
-	NSPERL_RELDATE :=20020626
-    PERL=/share/builds/sbstools/nsPerl/$(NSPERL_RELDATE)/$(NSOBJDIR_NAME_32)/nsperl
-  endif
+  PERL:=/usr/bin/env perl
   ZIP = $(COMPONENTS_DIR)/infozip/$(PKG_ARCH)/zip
   UNZIP = $(COMPONENTS_DIR)/infozip/$(PKG_ARCH)/unzip -o
   IZIP  = $(ZIP) -ry9uT


Index: nsperl.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/nsperl.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nsperl.mk	8 Nov 2005 18:21:47 -0000	1.2
+++ nsperl.mk	15 Dec 2005 21:06:22 -0000	1.3
@@ -62,7 +62,7 @@
 endif
 ifeq ($(OSVER),SunOS5.9)
   SUNOS_ARCH = $(shell uname -m)
-  PERL5=/usr/bin/perl
+  PERL5:=/usr/bin/env perl
 endif
 ifeq ($(OSVER),SunOS5.5.1)
 PERL5=/tools/ns-arch/soft/perl-5.004_04/run/default/sparc_sun_solaris2.3/bin/perl5
@@ -76,6 +76,9 @@
 ifeq ($(OSVER), HP-UXB.11.11)	
 PERL5=/u/robobld/nsperl/hpux/nsperl
 endif
+ifeq ($(OSVER), HP-UXB.11.23)	
+PERL5=/usr/bin/env perl
+endif
 ifeq ($(BUILD_ARCH), Linux)
-PERL5=perl
+PERL5:=/usr/bin/env perl
 endif


Index: pumpkin.pl
===================================================================
RCS file: /cvs/dirsec/adminutil/pumpkin.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- pumpkin.pl	20 Jul 2005 22:51:31 -0000	1.1.1.1
+++ pumpkin.pl	15 Dec 2005 21:06:22 -0000	1.2
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 # BEGIN COPYRIGHT BLOCK
 # Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.