]>
Commit | Line | Data |
---|---|---|
5b0f0ac9 MM |
1 | --- rpm-4.0.4/installplatform.wiget Tue Feb 12 21:59:53 2002 |
2 | +++ rpm-4.0.4/installplatform Tue Feb 12 22:31:13 2002 | |
3 | @@ -21,12 +21,13 @@ | |
156cd721 AF |
4 | |
5 | RPM="./rpm --rcfile $TEMPRC" | |
6 | ||
7 | -arch="`$RPM --eval '%{_arch}'`" | |
5b0f0ac9 MM |
8 | +canonarch_sed='s_i.86_i386_;s_athlon_i386_;s_sparc[^-]*_sparc_;s_alpha[^-]*_alpha_;s_\(powerpc\|ppc\)[^-]*_ppc_' |
9 | +arch="`$RPM --eval '%{_arch}'|sed -e "$canonarch_sed"`" | |
156cd721 AF |
10 | VENDOR="`$RPM --eval '%{_vendor}'`" |
11 | OS="`$RPM --eval '%{_os}'`" | |
5b0f0ac9 MM |
12 | RPMRC_GNU="`$RPM --eval '%{_gnu}'`" |
13 | -target_platform="`$RPM --eval '%{?_gnu:%undefine _gnu}%{_target_platform}'`" | |
156cd721 | 14 | -target="`$RPM --eval '%{_target}'`" |
5b0f0ac9 MM |
15 | +target_platform="`$RPM --eval '%{?_gnu:%undefine _gnu}%{_target_platform}'|sed -e "$canonarch_sed"`" |
16 | +target="`$RPM --eval '%{_target}'|sed -e "$canonarch_sed"`" | |
156cd721 AF |
17 | |
18 | rm -f ${DESTDIR}/${pkglibdir}/noarch-${VENDOR}-${OS} | |
19 | ln -s ${arch}-${VENDOR}-${OS} ${DESTDIR}/${pkglibdir}/noarch-${VENDOR}-${OS} | |
5b0f0ac9 MM |
20 | @@ -34,13 +35,12 @@ |
21 | ln -s ${arch}-${VENDOR}-${OS} ${DESTDIR}/${pkglibdir}/noarch-${OS} | |
22 | ||
23 | case "$arch" in | |
24 | - i[3456]86) SUBSTS='s_i386_i386_ s_i386_i486_ s_i386_i586_ s_i386_i686_ s_i386_athlon_' ;; | |
25 | + i[3456]86|athlon) SUBSTS='s_i386_i386_ s_i386_i486_ s_i386_i586_ s_i386_i686_ s_i386_athlon_' ;; | |
26 | alpha*) SUBSTS='s_alpha_alpha_ s_alpha_alphaev5_ s_alpha_alphaev56_ s_alpha_alphapca56_ s_alpha_alphaev6_ s_alpha_alphaev67_' ;; | |
156cd721 | 27 | sparc*) SUBSTS='s_sparc\(64\|v9\)_sparc_ s_sparc64_sparcv9_;s_sparc\([^v]\|$\)_sparcv9\1_ s_sparcv9_sparc64_;s_sparc\([^6]\|$\)_sparc64\1_' ;; |
5b0f0ac9 | 28 | powerpc*|ppc*) SUBSTS='s_ppc64_ppc_ s_ppc\([^6]\|$\)_ppc64\1_' ;; |
156cd721 AF |
29 | *) SUBSTS=y___ ;; |
30 | esac | |
5b0f0ac9 | 31 | -base_arch=`echo $arch | sed -e 's_i?86_i386_;s_sparc.*_sparc_;s_alpha.*_alpha_;s_\(powerpc\|ppc\).*_ppc_'` |
156cd721 AF |
32 | |
33 | for SUBST in $SUBSTS ; do | |
34 | ARCH=`echo $arch | sed -e $SUBST` | |
5b0f0ac9 MM |
35 | @@ -76,6 +76,7 @@ |
36 | case $VENDOR in | |
37 | pld) | |
38 | VENDORSED='-e s,^@pld@,,' | |
39 | + RPMRC_OPTFLAGS="`echo $RPMRC_OPTFLAGS | sed -e "s/ -g/ /"`" | |
40 | ;; | |
41 | mandrake) | |
42 | VENDORSED='-e s,^@mandrake@,,' | |
43 | @@ -91,12 +92,12 @@ | |
156cd721 AF |
44 | |
45 | cat $PLATFORM \ | |
46 | | sed -e "s,@RPMRC_OPTFLAGS@,$RPMRC_OPTFLAGS," \ | |
47 | - -e "s,@RPMRC_ARCH@,$base_arch," \ | |
5b0f0ac9 MM |
48 | + -e "s,@RPMRC_ARCH@,$ARCH," \ |
49 | -e "s,@RPMRC_GNU@,$RPMRC_GNU," \ | |
b4a2ba28 JB |
50 | -e "s,@LIB@,$LIB," \ |
51 | -e "s,@ARCH_INSTALL_POST@,$ARCH_INSTALL_POST," \ | |
52 | -e "s,@DEFAULTDOCDIR@,$DEFAULTDOCDIR," \ | |
5b0f0ac9 MM |
53 | - -e '/FLAGS:-/!s,\${,%{_,' \ |
54 | + -e '/\${\w*:-/!s,\${,%{_,' \ | |
ae2d90a3 AF |
55 | $MULTILIBSED \ |
56 | $VENDORSED \ | |
57 | | grep -v '^@' \ | |
5b0f0ac9 | 58 |