Date: Mon, 25 Oct 2021 12:35:17 GMT From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 3f89e8c6edef - 2021Q4 - editors/kakoune: fix build on armv6/armv7 Message-ID: <202110251235.19PCZHjB093154@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q4 has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f89e8c6edef45b5d01cded849018ac652f6f2ef commit 3f89e8c6edef45b5d01cded849018ac652f6f2ef Author: Robert Clausecker <fuz@fuz.su> AuthorDate: 2021-10-25 11:49:33 +0000 Commit: Tobias Kortkamp <tobik@FreeBSD.org> CommitDate: 2021-10-25 12:35:07 +0000 editors/kakoune: fix build on armv6/armv7 https://github.com/mawww/kakoune/issues/4385 PR: 259434 (cherry picked from commit 13c431b0bfec55991792bb215e463584c2fc243d) --- editors/kakoune/files/patch-src_main.cc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/editors/kakoune/files/patch-src_main.cc b/editors/kakoune/files/patch-src_main.cc new file mode 100644 index 000000000000..0c4fd9b6f327 --- /dev/null +++ b/editors/kakoune/files/patch-src_main.cc @@ -0,0 +1,17 @@ +--- src/main.cc.orig 2021-10-25 11:31:24 UTC ++++ src/main.cc +@@ -1249,8 +1249,12 @@ int main(int argc, char* argv[]) + } + + #if defined(__ELF__) +-asm(R"( +-.pushsection ".debug_gdb_scripts", "MS",@progbits,1 ++#ifdef __arm__ ++# define PROGBITS "%progbits" ++#else ++# define PROGBITS "@progbits" ++#endif ++asm(".pushsection \".debug_gdb_scripts\", \"MS\"," PROGBITS ",1" R"( + .byte 4 + .ascii "kakoune-inline-gdb.py\n" + .ascii "import os.path\n"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110251235.19PCZHjB093154>