Bug 943026 – dev-util/patchelf-0.18.0 m68k Keyword Request

• Status: CONFIRMED
• Product: Gentoo Linux

[Description immolo 2024-11-08 19:08:42 UTC]

m68k keyword was missed on the 0.18.0 bump and is causing releng to be unable to build m68k musl stages die to:

m68k-unknown-linux-musl-g++ -std=c++17 -DPACKAGE_NAME=\"patchelf\" -DPACKAGE_TARNAME=\"patchelf\" -DPACKAGE_VERSION=\"0.17.2\" -DPACKAGE_STRING=\"patchelf\ 0.17.2\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DPACKAGE=\"patchelf\" -DVERSION=\"0.17.2\" -DHAVE_CXX17=1 -I.    -Wall -std=c++17 -D_FILE_OFFSET_BITS=64     -pipe -O2 -c -o patchelf.o patchelf.cc
patchelf.cc: In member function 'void ElfFile<Elf_Ehdr, Elf_Phdr, Elf_Shdr, Elf_Addr, Elf_Off, Elf_Dyn, Elf_Sym, Elf_Verneed, Elf_Versym>::rewriteHeaders(Elf_Addr)':
patchelf.cc:1087:33: error: 'DT_MIPS_XHASH' was not declared in this scope; did you mean 'DT_MIPS_FLAGS'?
 1087 |             } else if (d_tag == DT_MIPS_XHASH) {
      |                                 ^~~~~~~~~~~~~
      |                                 DT_MIPS_FLAGS
make[1]: *** [Makefile:380: patchelf.o] Error 1
make[1]: Leaving directory '/var/tmp/portage/dev-util/patchelf-0.17.2/work/patchelf-0.17.2/src'
make: *** [Makefile:448: all-recursive] Error 1

Adding ~m68k will resolve the issue.

[Comment 1 Sam James 2024-11-09 05:16:08 UTC]

Nono, it wasn't missed.

commit c6604aaa5fdfda4d1954438833fc783eee63f6d0
Author: James Le Cuirot <[e-mail]>
Date:   Thu Aug 24 22:38:48 2023 +0100

    dev-util/patchelf: Drop sparc keyword on 0.18.0 and stabilise 0.17.2 instead

    The 0.18.0 tests fail on sparc but the 0.17.2 tests pass.

    Bug: https://bugs.gentoo.org/912847
    Signed-off-by: James Le Cuirot <[e-mail]>

commit 4761dc091493f78ef61235e9ab5669510e7bd622
Author: James Le Cuirot <[e-mail]>
Date:   Thu Aug 24 22:34:14 2023 +0100

    dev-util/patchelf: Keyword 0.17.2 for ~m68k

    The tests pass.

    Bug: https://bugs.gentoo.org/912847
    Signed-off-by: James Le Cuirot <[e-mail]>

commit 6af4f6b73ab3d1b5730bb3cabaa50a2fe7f40b5e
Author: James Le Cuirot <[e-mail]>
Date:   Thu Aug 24 22:33:45 2023 +0100

    dev-util/patchelf: Restore 0.17.2

    0.18.0 fails tests on some architectures.

    Bug: https://bugs.gentoo.org/912847
    Signed-off-by: James Le Cuirot <[e-mail]>

Specifically https://bugs.gentoo.org/912847#c1.

[Comment 2 immolo 2024-11-09 11:46:09 UTC]

Thanks for the save!

I'll look into backporting the 1.18.0 fix in the meantime to try and clear the releng issue.

[Comment 3 Larry the Git Cow 2024-12-01 11:51:43 UTC]

The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd357ea56a817343b7bbca3b0393622ab73b3f25

commit bd357ea56a817343b7bbca3b0393622ab73b3f25
Author:     Ian Jordan <[e-mail]>
AuthorDate: 2024-11-10 19:43:51 +0000
Commit:     Sam James <[e-mail]>
CommitDate: 2024-12-01 11:48:30 +0000

    dev-util/patchelf: Backport dt-mips-xhash patch
    
    As patchelf-0.18.0 is still not working correctly on all arches, this patch
    will allow 0.17.2 to continue to compile in the meantime.
    
    Bug: https://bugs.gentoo.org/943026
    Signed-off-by: Ian Jordan <[e-mail]>
    Closes: https://github.com/gentoo/gentoo/pull/39261
    Signed-off-by: Sam James <[e-mail]>

 .../files/patchelf-0.17.2-dt-mips-xhash.patch      | 14 ++++++++++++
 dev-util/patchelf/patchelf-0.17.2-r1.ebuild        | 26 ++++++++++++++++++++++
 2 files changed, 40 insertions(+)