From nobody Mon Oct 25 12:35:17 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 92AA018274CA; Mon, 25 Oct 2021 12:35:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HdDts3Zr1z4sqD; Mon, 25 Oct 2021 12:35:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5B159E20; Mon, 25 Oct 2021 12:35:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19PCZHtY093155; Mon, 25 Oct 2021 12:35:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19PCZHjB093154; Mon, 25 Oct 2021 12:35:17 GMT (envelope-from git) Date: Mon, 25 Oct 2021 12:35:17 GMT Message-Id: <202110251235.19PCZHjB093154@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Tobias Kortkamp Subject: git: 3f89e8c6edef - 2021Q4 - editors/kakoune: fix build on armv6/armv7 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tobik X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 3f89e8c6edef45b5d01cded849018ac652f6f2ef Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f89e8c6edef45b5d01cded849018ac652f6f2ef commit 3f89e8c6edef45b5d01cded849018ac652f6f2ef Author: Robert Clausecker AuthorDate: 2021-10-25 11:49:33 +0000 Commit: Tobias Kortkamp 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"