[Rpm-maint] [rpm-software-management/rpm] Fix support of MIPS r6 (#916)

YunQiang Su notifications at github.com
Tue Oct 29 15:46:40 UTC 2019


For current code 
   `rpmbuild --eval '%{_target_cpu}'`
show:
   mips64r6el
which is not correct, since there is no mips64r6el in config.guess/config.sub at all,
and gcc cannot recognized it.

To make the archname shorter, I also tried this patch.
`diff --git a/configure.ac b/configure.ac                                                                                                                                                                                                                                        index 6fb8d98..5ec8a74 100644                                                                                                                                                                                                                                                   --- a/configure.ac                                                                                                                                                                                                                                                              +++ b/configure.ac                                                                                                                                                                                                                                                              @@ -1073,6 +1073,14 @@ if echo "$host_os" | grep '.*-gnueabi' > /dev/null ; then                                                                                                                                                                                                        host_os=`echo "${host_os}" | sed 's/-gnueabi$//'`                                                                                                                                                                                                                               host_os_gnu=-gnueabi                                                                                                                                                                                                                                                     fi                                                                                                                                                                                                                                                                             +if echo "$host_os" | grep '.*-gnuabi64' > /dev/null ; then                                                                                                                                                                                                                     +       host_os=`echo "${host_os}" | sed 's/-gnuabi64$//'`                                                                                                                                                                                                                      +       host_os_gnu=-gnuabi64                                                                                                                                                                                                                                                   +fi                                                                                                                                                                                                                                                                             +if echo "$host_os" | grep '.*-gnuabin32' > /dev/null ; then                                                                                                                                                                                                                    +       host_os=`echo "${host_os}" | sed 's/-gnuabin32$//'`                                                                                                                                                                                                                     +       host_os_gnu=-gnuabin32                                                                                                                                                                                                                                                  +fi                                                                                                                                                                                                                                                                              if echo "$host_os" | grep '.*-gnu' > /dev/null ; then                                                                                                                                                                                                                                  host_os=`echo "${host_os}" | sed 's/-gnu$//'`                                                                                                                                                                                                                            fi                                                                                                                                                                                                                                                                             diff --git a/rpmrc.in b/rpmrc.in                                                                                                                                                                                                                                                index 5bd9ba3..1c94a9b 100644                                                                                                                                                                                                                                                   --- a/rpmrc.in                                                                                                                                                                                                                                                                  +++ b/rpmrc.in                                                                                                                                                                                                                                                                  @@ -249,10 +249,10 @@ arch_canon:       sh4a: sh4a      17                                                                                                                                                                                                                       arch_canon:    xtensa: xtensa  18                                                                                                                                                                                                                                               arch_canon:    aarch64: aarch64 19                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             -arch_canon:    mipsr6: mipsr6  20                                                                                                                                                                                                                                              -arch_canon:    mipsr6el: mipsr6el      20                                                                                                                                                                                                                                      -arch_canon:    mips64r6: mips64r6      21                                                                                                                                                                                                                                      -arch_canon:    mips64r6el: mips64r6el  21                                                                                                                                                                                                                                      +arch_canon:    mipsr6: mipsisa32r6     20                                                                                                                                                                                                                                      +arch_canon:    mipsr6el: mipsisa32r6el 20                                                                                                                                                                                                                                      +arch_canon:    mips64r6: mipsisa64r6   21                                                                                                                                                                                                                                      +arch_canon:    mips64r6el: mipsisa64r6el       21                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               arch_canon:    riscv: riscv64  22                                                                                                                                                                                                                                               arch_canon:    riscv64: riscv64        22        `

While the rpm filename is still like:
basesystem-11-8.mipsisa64r6el.rpm

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/916#issuecomment-547489168
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rpm.org/pipermail/rpm-maint/attachments/20191029/6a42e126/attachment-0001.html>


More information about the Rpm-maint mailing list