Imported Upstream version 4.14.1

[platform/upstream/rpm.git] / installplatform

diff --git a/installplatform b/installplatform
index 9a11bc3..12339fc 100755 (executable)
--- a/installplatform
+++ b/installplatform
@@ -54,12 +54,18 @@ for ARCH in noarch `grep ^arch_canon $RPMRC | cut -d: -f2`; do
        CANONARCH=s390x
        CANONCOLOR=3
        ;;
-    ppc64*)
+    ppc64|ppc64p7)
        ISANAME=ppc
        ISABITS=64
        CANONARCH=ppc64
        CANONCOLOR=3
        ;;
+    ppc64le)
+       ISANAME=ppc
+        ISABITS=64
+        CANONARCH=ppc64le
+        CANONCOLOR=3
+       ;;
     ppc*)
        ISANAME=ppc
        ISABITS=32
@@ -90,6 +96,12 @@ for ARCH in noarch `grep ^arch_canon $RPMRC | cut -d: -f2`; do
        CANONARCH=${ARCH}
        CANONCOLOR=0
        ;;
+    armv7h*)
+       ISANAME=armv7hl
+       ISABITS=32
+       CANONARCH=arm
+       CANONCOLOR=0
+       ;;
     arm*)
        ISANAME=`echo ${ARCH} | sed "s/^\([^-]*\)-.*/\1/"`
        ISABITS=32
@@ -108,6 +120,66 @@ for ARCH in noarch `grep ^arch_canon $RPMRC | cut -d: -f2`; do
        CANONARCH=aarch64
        CANONCOLOR=3
        ;;
+    mips)
+       ISANAME=mips
+       ISABITS=32
+       CANONARCH=mips
+       CANONCOLOR=0
+       ;;
+    mipsel)
+       ISANAME=mips
+       ISABITS=32
+       CANONARCH=mipsel
+       CANONCOLOR=0
+       ;;
+    mips64)
+       ISANAME=mips
+       ISABITS=64
+       CANONARCH=mips64
+       CANONCOLOR=3
+       ;;
+    mips64el)
+       ISANAME=mips
+       ISABITS=64
+       CANONARCH=mips64el
+       CANONCOLOR=3
+       ;;
+    mipsr6)
+       ISANAME=mipsr6
+       ISABITS=32
+       CANONARCH=mipsr6
+       CANONCOLOR=0
+       ;;
+    mipsr6el)
+       ISANAME=mipsr6
+       ISABITS=32
+       CANONARCH=mipsr6el
+       CANONCOLOR=0
+       ;;
+    mips64r6)
+       ISANAME=mipsr6
+       ISABITS=64
+       CANONARCH=mips64r6
+       CANONCOLOR=3
+       ;;
+    mips64r6el)
+       ISANAME=mipsr6
+       ISABITS=64
+       CANONARCH=mips64r6el
+       CANONCOLOR=3
+       ;;
+    m68k)
+       ISANAME=m68k
+       ISABITS=32
+       CANONARCH=m68k
+       CANONCOLOR=0
+       ;;
+    riscv64)
+       ISANAME=riscv
+       ISABITS=64
+       CANONARCH=riscv64
+       CANONCOLOR=3
+       ;;
     noarch)
        CANONARCH=noarch
        CANONCOLOR=0
@@ -142,5 +214,5 @@ for ARCH in noarch `grep ^arch_canon $RPMRC | cut -d: -f2`; do
 
 done
 
-# gently adjust autoconf variables to rpm macros...
-cat $MACROS | sed -e '/\${\w*:-/!s,\${,%{_,' > ${DESTDIR}/${pkglibdir}/macros
+# gently adjust undefined autoconf variables to rpm macros...
+cat $MACROS | sed -e 's,${prefix},%{_prefix},g' > ${DESTDIR}/${pkglibdir}/macros