ultrapenguin 1.1.9 sparc64 changes.

CVS patchset: 2605
CVS date: 1998/12/17 16:45:22

5 files changed, 42 insertions, 5 deletions

diff --git a/CHANGES b/CHANGES
index d8b183536..720629cd0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -38,6 +38,7 @@
 	- there must be a { between two % in a query format (unless %% is used)
 
 2.5.5 -> 2.5.6:
+	- ultrapenguin 1.1.9 sparc64 changes.
 	- attempt ftp ABOR on query/verify url's.
 	- cache open ftp control descriptor with password.
 	- verify needed same realpath semantics as query.
diff --git a/autodeps/sparc-linux.req b/autodeps/sparc-linux.req
new file mode 100644
index 000000000..d2f922e52
--- /dev/null
+++ b/autodeps/sparc-linux.req
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# note this works for both a.out and ELF executables
+# it also auto-generates requirment lines for shell scripts
+
+ulimit -c 0
+
+filelist=`sed "s/['\"]/\\\&/g"`
+exelist=`echo $filelist | xargs -r file | fgrep executable | cut -d: -f1 `
+scriptlist=`echo $filelist | xargs -r file | egrep ":.* (commands|script) " | cut -d: -f1 `
+liblist=`echo $filelist | xargs -r file | grep "shared object" | cut -d : -f1 `
+
+for f in $exelist; do
+    if [ -x $f ]; then
+	ldd $f | awk '/=>/ { print $1 }'
+    fi
+done | sort -u | sed "s/['\"]/\\\&/g" | xargs -r -n 1 basename | grep -v '4[um]lib.so' | sort -u
+
+for f in $liblist; do
+    ldd $f | awk '/=>/ { print $1 }'
+done | sort -u | sed "s/['\"]/\\\&/g" | xargs -r -n 1 basename | grep -v '4[um]lib.so' | sort -u
+
+for f in $scriptlist; do
+    if [ -x $f ]; then
+	head -1 $f | sed -e 's/^\#\![ 	]*//' | cut -d" " -f1
+    fi
+done | sort -u
diff --git a/configure.in b/configure.in
index 6be74c471..d778a1b7a 100644
--- a/configure.in
+++ b/configure.in
@@ -557,7 +557,10 @@ build_os_noversion=`echo "${build_os}" | sed 's/[0-9]*\..*$//'`
 changequote([, ])
 
 rm -f ./find-provides.sh
-if test -f ${srcdir}/autodeps/${build_os_exact}.prov ; then
+if test -f ${srcdir}/autodeps/${build_cpu}-${build_os_exact}.prov ; then
+	echo "using ${srcdir}/autodeps/${build_cpu}-${build_os_exact}.prov for automatic provides generation"
+    ln -s ${srcdir}/autodeps/${build_cpu}-${build_os_exact}.prov ./find-provides.sh
+elif test -f ${srcdir}/autodeps/${build_os_exact}.prov ; then
 	echo "using ${srcdir}/autodeps/${build_os_exact}.prov for automatic provides generation"
     ln -s ${srcdir}/autodeps/${build_os_exact}.prov ./find-provides.sh
 elif test -f ${srcdir}/autodeps/${build_os_major}.prov ; then
@@ -572,7 +575,10 @@ else
 fi
 
 rm -f ./find-requires.sh
-if test -f ${srcdir}/autodeps/${build_os_exact}.req ; then
+if test -f ${srcdir}/autodeps/${build_cpu}-${build_os_exact}.req ; then
+	echo "using ${srcdir}/autodeps/${build_cpu}-${build_os_exact}.req for automatic requires generation"
+    ln -s ${srcdir}/autodeps/${build_cpu}-${build_os_exact}.req ./find-requires.sh
+elif test -f ${srcdir}/autodeps/${build_os_exact}.req ; then
 	echo "using ${srcdir}/autodeps/${build_os_exact}.req for automatic requires generation"
     ln -s ${srcdir}/autodeps/${build_os_exact}.req ./find-requires.sh
 elif test -f ${srcdir}/autodeps/${build_os_major}.req ; then
diff --git a/lib-rpmrc.in b/lib-rpmrc.in
index 9bd3b2da4..522cd1d84 100644
--- a/lib-rpmrc.in
+++ b/lib-rpmrc.in
@@ -25,6 +25,7 @@ instchangelog:	5
 optflags: i386 -O2 -m486 -fno-strength-reduce
 optflags: alpha -O2
 optflags: sparc -O2
+optflags: sparc64 -O2
 optflags: m68k -O2 -fomit-frame-pointer
 optflags: ppc -O2 -fsigned-char
 optflags: parisc -O2 -mpa-risc-1-0
@@ -61,7 +62,8 @@ arch_canon:	m68k:	m68k	6
 arch_canon:	IP:	sgi	7
 arch_canon:     rs6000:	rs6000  8
 
-arch_canon:	sun4u:	usparc  10
+arch_canon:	sparc64:sparc64 10
+arch_canon:	sun4u:	sparc64 10
 arch_canon:	mipsel:	mipsel	11
 
 arch_canon:     armv4b:	armv4b 	12
@@ -139,7 +141,7 @@ arch_compat: osfmach3_ppc: ppc
 arch_compat: powerpc: ppc
 arch_compat: powerppc: ppc
 
-arch_compat: usparc: sparc
+arch_compat: sparc64: sparc
 arch_compat: sparc: noarch
 
 arch_compat: ppc: rs6000
@@ -183,6 +185,7 @@ buildarch_compat: i586: i486
 buildarch_compat: i486: i386
 buildarch_compat: i386: noarch
 
+buildarch_compat: sparc64: noarch
 buildarch_compat: sparc: noarch
 buildarch_compat: alpha: noarch
 buildarch_compat: m68k: noarch
diff --git a/rpm.magic b/rpm.magic
index c49408f2a..01a9b5483 100644
--- a/rpm.magic
+++ b/rpm.magic
@@ -15,7 +15,7 @@
 >>8	beshort		6		68000
 >>8	beshort		7		SGI
 >>8	beshort		8		RS6000
->>8	beshort		10		usparc
+>>8	beshort		10		Sparc 64bit
 >>8	beshort		11		MIPS little endian
 >>8	beshort		12		ARM
 >>10	string		x		%s