diff options
| -rwxr-xr-x | installplatform | 4 | ||||
| -rw-r--r-- | scripts/Makefile.am | 2 | ||||
| -rw-r--r-- | scripts/brp-sparc64-linux | 41 |
3 files changed, 3 insertions, 44 deletions
diff --git a/installplatform b/installplatform index 266d877b8..f5c7ecd81 100755 --- a/installplatform +++ b/installplatform @@ -59,8 +59,8 @@ for SUBST in $SUBSTS ; do sparcv8-linux) MULTILIBNO=1 ;; sparcv9-linux) MULTILIBNO=1 ;; sparcv9v-linux) MULTILIBNO=1 ;; - sparc64-linux) ARCH_INSTALL_POST=${pkglibdir}/brp-sparc64-linux; LIB=lib64; MULTILIBNO=2 ;; - sparc64v-linux) ARCH_INSTALL_PORT=${pkglibdir}/brp-sparc64-linux; LIB=lib64; MULTILIBNO=2 ;; + sparc64-linux) LIB=lib64; MULTILIBNO=2 ;; + sparc64v-linux) LIB=lib64; MULTILIBNO=2 ;; s390-linux) MULTILIBNO=1 ;; s390x-linux) LIB=lib64; MULTILIBNO=2 ;; ppc-linux) MULTILIBNO=1 ;; diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 3af78429b..aadacc54c 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -24,7 +24,7 @@ EXTRA_DIST = \ rpmconfig_SCRIPTS = \ brp-compress brp-python-bytecompile brp-java-gcjcompile \ brp-strip brp-strip-comment-note \ - brp-strip-shared brp-strip-static-archive brp-sparc64-linux \ + brp-strip-shared brp-strip-static-archive \ check-files check-prereqs \ check-buildroot check-rpaths check-rpaths-worker \ find-lang.sh \ diff --git a/scripts/brp-sparc64-linux b/scripts/brp-sparc64-linux deleted file mode 100644 index 5e511b3ce..000000000 --- a/scripts/brp-sparc64-linux +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# If using normal root, avoid changing anything. -if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then - exit 0 -fi -files= -LC_ALL= -LANG= - -# Move 64bit ELF objects from /lib, /usr/lib, /usr/X11R6/lib to */lib64 -# directories - -for f in `find $RPM_BUILD_ROOT{,/usr,/usr/X11R6}/lib -maxdepth 1 -type f -o -type l 2>/dev/null`; do - ff=$f - while [ -L $ff ]; do - l=`ls -l $ff | awk '{ print $11 }'` - case $l in - /*) ff=$RPM_BUILD_ROOT$l ;; - *) ff=`dirname $ff`/$l ;; - esac - done - if file $ff 2>/dev/null | grep ': ELF 64-bit .SB' | grep -v ': ELF 64-bit .SB executable' > /dev/null; then - files="$files $f" - elif file $ff 2>/dev/null | grep 'ar archive' > /dev/null; then - if objdump -h $ff 2>/dev/null | grep ':[ ]*file format elf64-sparc' > /dev/null; then - files="$files $f" - fi - fi -done -for f in $files; do - d=`dirname $f` - n=`basename $f` - if [ ! -d ${d}64 ]; then mkdir -p ${d}64; fi - if [ -L $f ]; then - l=`ls -l $f | awk '{ print $11 }' | sed 's_lib\(/[^/]*\)$_lib64\1_'` - ln -sf $l ${d}64/$n - rm -f $f - else - mv -f $f ${d}64/$n - fi -done |