]> git.pld-linux.org Git - packages/rpm.git/commitdiff
- make sure to pick the right color for x32
authorJan Rękorajski <baggins@pld-linux.org>
Tue, 27 Oct 2020 21:04:15 +0000 (22:04 +0100)
committerJan Rękorajski <baggins@pld-linux.org>
Tue, 27 Oct 2020 21:04:15 +0000 (22:04 +0100)
x32.patch

index 5be418e40fb32fc91a94f06c8490404460a934d7..2afb1fdd0969efb630da2e4463e14f3a286d8306 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -22,6 +22,18 @@ diff -ur rpm-4.15.1.orig/build/rpmfc.c rpm-4.15.1/build/rpmfc.c
        if (fcolor & RPMFC_INCLUDE)
            break;
      }
+@@ -1152,7 +1152,10 @@
+               color = RPMFC_ELF64;
+               break;
+           case ELFCLASS32:
+-              color = RPMFC_ELF32;
++              if (ehdr.e_machine == EM_X86_64)
++                  color = RPMFC_ELFX32;
++              else
++                  color = RPMFC_ELF32;
+               break;
+           }
+           elf_end(elf);
 diff -ur rpm-4.15.1.orig/build/rpmfc.h rpm-4.15.1/build/rpmfc.h
 --- rpm-4.15.1.orig/build/rpmfc.h      2019-06-26 16:17:31.397985717 +0200
 +++ rpm-4.15.1/build/rpmfc.h   2019-12-29 13:45:05.936980833 +0100
This page took 0.094432 seconds and 4 git commands to generate.