Maintain noarch as self-contained architecture (mouse@)
This commit is contained in:
parent
c59eaf7d69
commit
87650a4c3d
@ -29,16 +29,12 @@ RPMRC_GNU="`$RPM --eval '%{_gnu}'`"
|
||||
target_platform="`$RPM --eval '%{?_gnu:%undefine _gnu}%{_target_platform}'`"
|
||||
target="`$RPM --eval '%{_target}'`"
|
||||
|
||||
rm -f ${DESTDIR}/${pkglibdir}/noarch-${VENDOR}-${OS}
|
||||
ln -s ${arch}-${VENDOR}-${OS} ${DESTDIR}/${pkglibdir}/noarch-${VENDOR}-${OS}
|
||||
rm -f ${DESTDIR}/${pkglibdir}/noarch-${OS}
|
||||
ln -s ${arch}-${VENDOR}-${OS} ${DESTDIR}/${pkglibdir}/noarch-${OS}
|
||||
|
||||
case "$arch" in
|
||||
i[3456]86|k6|athlon|pentium4) SUBSTS='s_\(i[3456]86\|k6\|athlon\|pentium4\)_i386_ s_\(i[3456]86\|k6\|athlon\|pentium4\)_i486_ s_\(i[3456]86\|k6\|athlon\|pentium4\)_i586_ s_\(i[3456]86\|k6\|athlon\|pentium4\)_i686_ s_\(i[3456]86\|k6\|athlon\|pentium4\)_k6_ s_\(i[3456]86\|k6\|athlon\|pentium4\)_athlon_ s_\(i[3456]86\|k6\|athlon\|pentium4\)_pentium4_' ;;
|
||||
i[3456]86|k6|athlon|pentium4) SUBSTS='s_\(i[3456]86\|k6\|athlon\|pentium4\)_i386_ s_\(i[3456]86\|k6\|athlon\|pentium4\)_i486_ s_\(i[3456]86\|k6\|athlon\|pentium4\)_i586_ s_\(i[3456]86\|k6\|athlon\|pentium4\)_i686_ s_\(i[3456]86\|k6\|athlon\|pentium4\)_k6_ s_\(i[3456]86\|k6\|athlon\|pentium4\)_athlon_ s_\(i[3456]86\|k6\|athlon\|pentium4\)_pentium4_ s_\(i[3456]86\|k6\|athlon\|pentium4\)_noarch_' ;;
|
||||
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_' ;;
|
||||
x86_64) SUBSTS='s,x86_64,x86_64, s,x86_64,noarch,' ;;
|
||||
*) SUBSTS=y___ ;;
|
||||
esac
|
||||
base_arch=`echo $arch | sed -e 's_i?86_i386_;s_sparc.*_sparc_;s_alpha.*_alpha_;s_\(powerpc\|ppc\).*_ppc_;s,amd64,x86_64,'`
|
||||
|
@ -24,7 +24,7 @@
|
||||
%_sharedstatedir @sharedstatedir@
|
||||
%_localstatedir @localstatedir@
|
||||
%_lib @LIB@
|
||||
%_libdir @LIBDIR@
|
||||
%_libdir @prefix@/@LIB@
|
||||
%_includedir @includedir@
|
||||
%_oldincludedir @oldincludedir@
|
||||
%_infodir @infodir@
|
||||
|
Loading…
Reference in New Issue
Block a user