diff options
| author | arekm <devnull@localhost> | 2004-03-28 02:41:32 +0000 |
|---|---|---|
| committer | arekm <devnull@localhost> | 2004-03-28 02:41:32 +0000 |
| commit | b07c0fbce4c6647cd8bb2dde7b3416d95dfdf986 (patch) | |
| tree | 98e8dbd7d3ce69954feb418ab0148f8c5fe21f71 /installplatform | |
| parent | 1cdfdb8b6ca37e51631b1ca44cf43636929bfaa9 (diff) | |
| download | rpm-b07c0fbce4c6647cd8bb2dde7b3416d95dfdf986.tar.gz | |
pentium3/pentium4 support by Pawe³ Sikora <pluto/at/pld-linux.org>.
Modified Files: installplatform macros.in rpmrc.in lib/rpmrc.c lib/rpmts.c
CVS patchset: 7198
CVS date: 2004/03/28 02:41:32
Diffstat (limited to 'installplatform')
| -rwxr-xr-x | installplatform | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/installplatform b/installplatform index 0fb8b5c6b..f89af7f34 100755 --- a/installplatform +++ b/installplatform @@ -21,7 +21,7 @@ E_O_F RPM="./rpm --rcfile $TEMPRC" -canonarch_sed='s_i.86_i386_;s_athlon_i386_;s_sparc[^-]*_sparc_;s_alpha[^-]*_alpha_;s_\(powerpc\|ppc\)[^-]*_ppc_' +canonarch_sed='s_i.86_i386_;s_pentium[34]_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}'`" @@ -30,7 +30,7 @@ target_platform="`$RPM --eval '%{?_gnu:%undefine _gnu}%{_target_platform}'|sed - target="`$RPM --eval '%{_target}'|sed -e "$canonarch_sed"`" case "$arch" in - i[3456]86|athlon) SUBSTS='s_i386_i386_ s_i386_i486_ s_i386_i586_ s_i386_i686_ s_i386_athlon_' ;; + i[3456]86|pentium[34]|athlon) SUBSTS='s_i386_i386_ s_i386_i486_ s_i386_i586_ s_i386_i686_ s_i386_pentium3_ s_i386_pentium4_ 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\([^6ip]\|$\)_ppc64\1_ s_ppc\([^6ip]\|$\)_ppciseries_ s_ppc\([^6ip]\|$\)_ppcpseries_ s_ppc\([^6ip]\|$\)_ppc64iseries_ s_ppc\([^6ip]\|$\)_ppc64pseries_' ;; @@ -65,7 +65,7 @@ for SUBST in $SUBSTS ; do s390x-linux) LIB=lib64; MULTILIBNO=2 ;; ppc-linux) MULTILIBNO=1 ;; ppc64-linux) LIB=lib64; MULTILIBNO=2 ;; - i?86-linux|athlon-linux) MULTILIBNO=1 ;; + i?86-linux|pentium?-linux|athlon-linux) MULTILIBNO=1 ;; x86_64-linux) LIB=lib64; MULTILIBNO=2 ;; esac |