diff options
| author | jbj <devnull@localhost> | 2002-07-30 17:07:39 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2002-07-30 17:07:39 +0000 |
| commit | 06b3f0c2061b989347240cd6644206c5b429b190 (patch) | |
| tree | db69fe0f35116a8f408a5d03194a4b62ec4066aa /installplatform | |
| parent | f32db08a31ae8925fd6f05354e598635a978c171 (diff) | |
| download | rpm-06b3f0c2061b989347240cd6644206c5b429b190.tar.gz rpm-06b3f0c2061b989347240cd6644206c5b429b190.tar.bz2 rpm-06b3f0c2061b989347240cd6644206c5b429b190.zip | |
installplatform clean up, add athlon (PLD).
CVS patchset: 5582
CVS date: 2002/07/30 17:07:39
Diffstat (limited to 'installplatform')
| -rwxr-xr-x | installplatform | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/installplatform b/installplatform index 894e81f31..ead6f15e8 100755 --- a/installplatform +++ b/installplatform @@ -21,21 +21,21 @@ E_O_F RPM="./rpm --rcfile $TEMPRC" -arch="`$RPM --eval '%{_arch}'`" +canonarch_sed='s_i.86_i386_;s_athlon_i386_;s_sparc[^-]*_sparc_;s_alpha[^-]*_alpha_;s_\(powerpc\|ppc\)[^-]*_ppc_' +arch="`$RPM --eval '%{_arch}'|sed -e "$canonarch_sed"`" VENDOR="`$RPM --eval '%{_vendor}'`" OS="`$RPM --eval '%{_os}'`" RPMRC_GNU="`$RPM --eval '%{_gnu}'`" -target_platform="`$RPM --eval '%{?_gnu:%undefine _gnu}%{_target_platform}'`" -target="`$RPM --eval '%{_target}'`" +target_platform="`$RPM --eval '%{?_gnu:%undefine _gnu}%{_target_platform}'|sed -e "$canonarch_sed"`" +target="`$RPM --eval '%{_target}'|sed -e "$canonarch_sed"`" case "$arch" in - i[3456]86) SUBSTS='s_i386_i386_ s_i386_i486_ s_i386_i586_ s_i386_i686_ s_i386_athlon_' ;; + i[3456]86|athlon) SUBSTS='s_i386_i386_ s_i386_i486_ s_i386_i586_ s_i386_i686_ s_i386_athlon_' ;; alpha*) SUBSTS='s_alpha_alpha_ s_alpha_alphaev5_ s_alpha_alphaev56_ s_alpha_alphapca56_ s_alpha_alphaev6_ s_alpha_alphaev67_' ;; sparc*) SUBSTS='s_sparc\(64\|v9\)_sparc_ s_sparc64_sparcv9_;s_sparc\([^v]\|$\)_sparcv9\1_ s_sparcv9_sparc64_;s_sparc\([^6]\|$\)_sparc64\1_' ;; powerpc*|ppc*) SUBSTS='s_ppc64_ppc_ s_ppc\([^6]\|$\)_ppc64\1_' ;; *) SUBSTS=y___ ;; esac -base_arch=`echo $arch | sed -e 's_i?86_i386_;s_sparc.*_sparc_;s_alpha.*_alpha_;s_\(powerpc\|ppc\).*_ppc_'` for SUBST in $SUBSTS ; do ARCH=`echo $arch | sed -e $SUBST` @@ -74,6 +74,7 @@ for SUBST in $SUBSTS ; do ;; pld) VENDORSED='-e s,^@pld@,,' + RPMRC_OPTFLAGS="`echo $RPMRC_OPTFLAGS | sed -e "s/ -g/ /"`" ;; mandrake) VENDORSED='-e s,^@mandrake@,,' @@ -89,12 +90,12 @@ for SUBST in $SUBSTS ; do cat $PLATFORM \ | sed -e "s,@RPMRC_OPTFLAGS@,$RPMRC_OPTFLAGS," \ - -e "s,@RPMRC_ARCH@,$base_arch," \ + -e "s,@RPMRC_ARCH@,$ARCH," \ -e "s,@RPMRC_GNU@,$RPMRC_GNU," \ -e "s,@LIB@,$LIB," \ -e "s,@ARCH_INSTALL_POST@,$ARCH_INSTALL_POST," \ -e "s,@DEFAULTDOCDIR@,$DEFAULTDOCDIR," \ - -e '/FLAGS:-/!s,\${,%{_,' \ + -e '/\${\w*:-/!s,\${,%{_,' \ $MULTILIBSED \ $VENDORSED \ | grep -v '^@' \ |