From owner-dev-commits-ports-main@freebsd.org Thu Jun 3 11:33:40 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7CEAC657688; Thu, 3 Jun 2021 11:33:40 +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 4FwkLD2rkFz4qtg; Thu, 3 Jun 2021 11:33:40 +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 49D23FF5; Thu, 3 Jun 2021 11:33:40 +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 153BXe3L069331; Thu, 3 Jun 2021 11:33:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 153BXe5o069330; Thu, 3 Jun 2021 11:33:40 GMT (envelope-from git) Date: Thu, 3 Jun 2021 11:33:40 GMT Message-Id: <202106031133.153BXe5o069330@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: f9478b4f40b8 - main - games/minetest: fix link on aarch64 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f9478b4f40b89897a8f44f766562123f14b79576 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jun 2021 11:33:40 -0000 The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=f9478b4f40b89897a8f44f766562123f14b79576 commit f9478b4f40b89897a8f44f766562123f14b79576 Author: Dmitry Marakasov AuthorDate: 2021-06-02 19:44:20 +0000 Commit: Dmitry Marakasov CommitDate: 2021-06-03 10:56:18 +0000 games/minetest: fix link on aarch64 --- games/minetest/files/patch-src_CMakeLists.txt | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/games/minetest/files/patch-src_CMakeLists.txt b/games/minetest/files/patch-src_CMakeLists.txt new file mode 100644 index 000000000000..83617a6d4002 --- /dev/null +++ b/games/minetest/files/patch-src_CMakeLists.txt @@ -0,0 +1,20 @@ +diff --git src/CMakeLists.txt src/CMakeLists.txt +index 9526e88f9..06cb0d604 100644 +--- src/CMakeLists.txt ++++ src/CMakeLists.txt +@@ -758,7 +758,14 @@ else() + check_c_source_compiles("#ifndef __aarch64__\n#error\n#endif\nint main(){}" IS_AARCH64) + if(IS_AARCH64) + # Move text segment below LuaJIT's 47-bit limit (see issue #9367) +- SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-Ttext-segment=0x200000000") ++ if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") ++ # XXX: lld linke needs another option; not sure how to check for lld specifically, ++ # so just checking for FreeBSD (which uses lld) for now. I'm also not sure if its ++ # equivalent replacement and haven't runtested it, but it at least builds ++ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--image-base=0x200000000") ++ else() ++ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-Ttext-segment=0x200000000") ++ endif() + endif() + endif() +