fix msm-plugin.c svace issue: make sure dupPath is not NULL before strchr()

[platform/upstream/rpm.git] / installplatform

diff --git a/installplatform b/installplatform
index d16e535..79209e0 100755 (executable)
--- a/installplatform
+++ b/installplatform
@@ -5,18 +5,13 @@ pkglibdir="${pkglibdir:-/usr/lib/rpm}"
 platformdir="${pkglibdir}/platform"
 
 RPMRC="${1:-rpmrc}"
-MACROS="${2:-macros}"
-PLATFORM="${3:-platform}"
+PLATFORM="${2:-platform}"
+MACROS="${3:-macros}"
+VENDOR="${4}"
+OS="${5}"
+RPMRC_GNU="${6}"
 
-RPM="./rpm --rcfile=$RPMRC --macros=$MACROS"
-
-canonarch_sed='s_i.86_i386_;s_pentium[34]_i386_;s_athlon_i386_;s_sparc[^-]*_sparc_;s_alpha[^-]*_alpha_;s_arm[^-]*_arm_;s_\(powerpc\|ppc\)[^-]*_ppc_;s,\(ia32e\|amd64\),x86_64,;s_sh4a_sh4_'
-arch="`$RPM --eval '%{_arch}'|sed -e "$canonarch_sed"`"
-VENDOR="`$RPM --eval '%{_vendor}'`"
-OS="`$RPM --eval '%{_os}'`"
-RPMRC_GNU="`$RPM --eval '%{_gnu}'`"
-
-for ARCH in `grep ^arch_canon $RPMRC | cut -d: -f2`; do
+for ARCH in noarch `grep ^arch_canon $RPMRC | cut -d: -f2`; do
   RPMRC_OPTFLAGS="`sed -n 's/^optflags: '$ARCH' //p' $RPMRC`"
   RPMRC_OPTFLAGS="`echo $RPMRC_OPTFLAGS | sed -e 's, ,\ ,g'`"
   case $RPMRC_OPTFLAGS in
@@ -25,80 +20,234 @@ for ARCH in `grep ^arch_canon $RPMRC | cut -d: -f2`; do
   esac
 
   ARCH_INSTALL_POST='%{nil}'
-  case "${ARCH}-${OS}" in
-    sparc64*-linux) LIB=lib64 ;;
-    s390x-linux) LIB=lib64 ;;
-    ppc64-linux|powerpc64-linux) LIB=lib64 ;;
-    x86_64-linux|amd64-linux|ia32e-linux) LIB=lib64 ;;
-    *) LIB=lib;;
-  esac
+  LIB=lib
 
   # XXX FIXME: incomplete and quite likely wrong too in places,
   # consult various arch folks for correct names etc.
   ISANAME=
   ISABITS=
+  CANONARCH=
+  CANONCOLOR=
+  FILTER=cat
   case "${ARCH}" in
     sparc64*) 
        ISANAME=sparc
        ISABITS=64
+       CANONARCH=sparc64
+       CANONCOLOR=3
        ;;
     sparc*) 
        ISANAME=sparc
        ISABITS=32
+       CANONARCH=sparc
+       CANONCOLOR=0
        ;;
     s390)
        ISANAME=s390
        ISABITS=32
+       CANONARCH=s390
+       CANONCOLOR=0
        ;;
     s390x)
        ISANAME=s390
        ISABITS=64
+       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
+       CANONARCH=ppc
+       CANONCOLOR=0
        ;;
     i?86|pentium?|athlon|geode)
        ISANAME=x86
        ISABITS=32
+       CANONARCH=i386
+       CANONCOLOR=0
        ;;
     x86_64|amd64|ia32e)
        ISANAME=x86
        ISABITS=64
+       CANONARCH=x86_64
+       CANONCOLOR=3
        ;;
     ia64)
        ISANAME=ia
        ISABITS=64
+       CANONARCH=ia64
+       CANONCOLOR=2
        ;;
     sh*)
        ISANAME=sh
        ISABITS=32
+       CANONARCH=${ARCH}
+       CANONCOLOR=0
+       ;;
+    armv7h*)
+       ISANAME=armv7hl
+       ISABITS=32
+       CANONARCH=arm
+       CANONCOLOR=0
        ;;
     arm*)
        ISANAME=`echo ${ARCH} | sed "s/^\([^-]*\)-.*/\1/"`
        ISABITS=32
+       CANONARCH=arm
+       CANONCOLOR=0
        ;;
     alpha*)
        ISANAME=alpha
        ISABITS=64
+       CANONARCH=alpha
+       CANONCOLOR=0
+       ;;
+    aarch64)
+       ISANAME=aarch
+       ISABITS=64
+       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
+       FILTER="grep -v -E ^(%optflag|%__isa)"
        ;;
   esac
 
   # skip architectures for which we dont have full config parameters
-  [ -z "$ISANAME" ] && continue
+  [ -z "$CANONARCH" ] && continue
+
+  for macro in $(rpm --showrc | grep _host_cpu | cut -f2 );do
+    case "$macro" in
+      sparc64*) 
+      CANONCOLOR=3
+      ;;
+      sparc*) 
+      CANONCOLOR=0
+      ;;
+      s390)
+      CANONCOLOR=0
+      ;;
+      s390x)
+      CANONCOLOR=3
+      ;;
+      ppc64*)
+      CANONCOLOR=3
+      ;;
+      ppc*)
+      CANONCOLOR=0
+      ;;
+      i?86|pentium?|athlon|geode)
+      CANONCOLOR=0
+      ;;
+      x86_64|amd64|ia32e)
+      CANONCOLOR=3
+      ;;
+      ia64)
+      CANONCOLOR=2
+      ;;
+      sh*)
+      CANONCOLOR=0
+      ;;
+      arm*)
+      CANONCOLOR=0
+      ;;
+      alpha*)
+      CANONCOLOR=0
+      ;;
+      aarch64)
+      CANONCOLOR=3
+      ;;
+      noarch)
+      CANONCOLOR=0
+      ;;
+    esac
+  done
 
-  CANONARCH="`echo $ARCH|sed -e "$canonarch_sed"`"
+  if [ "$OS" = "linux" ] && [ "$CANONCOLOR" = 3 ]; then
+      LIB=${LIB}64
+  fi
 
   PPD="${DESTDIR}/${platformdir}/${ARCH}-${OS}"
   [ -d $PPD ] || mkdir -p $PPD
 
   cat $PLATFORM \
-  | sed -e "s,@RPMRC_OPTFLAGS@,$RPMRC_OPTFLAGS," \
-       -e "s,$arch,$CANONARCH," \
+  | sed -e "s#@RPMRC_OPTFLAGS@#$RPMRC_OPTFLAGS#" \
+       -e "s,@RPMCANONARCH@,$CANONARCH,g" \
+       -e "s,@RPMCANONCOLOR@,$CANONCOLOR," \
        -e "s,@RPMRC_GNU@,$RPMRC_GNU," \
        -e "s,@LIB@,$LIB," \
        -e "s,@ARCH_INSTALL_POST@,$ARCH_INSTALL_POST," \
@@ -107,12 +256,10 @@ for ARCH in `grep ^arch_canon $RPMRC | cut -d: -f2`; do
        -e "s,@ISABITS@,$ISABITS," \
        -e "s,^@${VENDOR}@,," \
   | grep -v '^@' \
+  | ${FILTER} \
   > ${PPD}/macros
 
 done
 
-{ cd ${DESTDIR}/${platformdir}
-  [ -L noarch-${OS} ] && rm -f noarch-${OS} 2>/dev/null
-  mkdir -p noarch-${OS}
-  sed -e "/^%_arch/s,${arch},noarch," ${arch}-${OS}/macros | grep -v '^%optflags' | grep -v "^%__isa" > noarch-${OS}/macros
-}
+# gently adjust undefined autoconf variables to rpm macros...
+cat $MACROS | sed -e 's,${prefix},%{_prefix},g' > ${DESTDIR}/${pkglibdir}/macros