From nobody Thu May 18 08:22:30 2023 X-Original-To: dev-commits-ports-all@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 4QMNJ64QJ5z3bNQB; Thu, 18 May 2023 08:22:30 +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 4QMNJ63dYhz3McH; Thu, 18 May 2023 08:22:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684398150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XbWqZ/x75ooBnifSehwa7pPRcedC+3NyG6DOmxQpjHs=; b=N/9B0TVjrg41cypLoRZGDgiUdto86x1dIQRDjYr4grpJH64zLH2MqU7WhYTsObm1MuZW84 y8PaY5SsEQAqBciLXBU3y4MkpIJYb7laQSKpSk5ra3buCqRcuBKjTiMIjc1X9cr7uGiARJ 7SPbAhTZM6M5vIyZ6+Jh/CYMR0r54XZGQA4i6AjzirIfmGivK603DgY9keEl8bfJ8BiugH VYZJct8rYj+syicZU5ahnAIcgIA3LYCBhEeKhFEGPCjnQYVVCnykEdmIevLUZbuiTY8zQz 4O0k6i/0N7b/RWbZO34oUheDu1Or1vXx+1UsfckesFQMk4SsmAXaHGXaB4YV6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684398150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XbWqZ/x75ooBnifSehwa7pPRcedC+3NyG6DOmxQpjHs=; b=uRR9+x5S2Yye/Utf1c/67zdn8/itW3iWQqUN7Ygu/KuV0jZ74MVWfAmpOiPATZRhlgj6OS nIWwqLd0XONF3xuojio5gLLr+6GxxkgCGQzHqs3TRbp+ObhTrOuVU6X68HtgaP//gQSlKU hyH/hBCEK+qCC2z+o69xF3DjIfa6bdnolauuDO55cV9POa2MNrtkmgXA0PzR891d2CqbLo fqqH9K5BWTVvZFaMRCahZLj0l4uAe+wfgOYQ6e/obBUfva3umxwKk+rn/6zsxjoASZaoSj ik2/bEQhNUTqhA1F01woBo67anF03IqTbrZqtFe0+wuY3IPT8m+NCEHJQuoODA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684398150; a=rsa-sha256; cv=none; b=qhLXkBZLPHnlGJZ2kjuaQrmoK1F2pB7Xn5FKi5cUoGFz6aGRp7iTQ2EuEZI/NPSPIKeZvH n0d11Jks5UdW3CBAJiHS9BAczKPizjR3ok+EykNWGDYA08XN1DEHokLtHxGIW5PgjF/URN PUuH0fJM2MOYXI+RAZa11iTEgkgdFeGtjk+V+j6/y178ZbXXVvelgD60UfAooW0kkoBbh9 qNJHU/Abo/7fYa18QZh4X/7on+l/gLv7BI1qljYovvvxP0WsZzGZjWJS6rd3zp1PLAHCmR H1yZPP1271WgMHEDzD9DX7Fm8wQclfvva1BkbMqjIlK8TBskGmWsrZ7aXPMnNQ== 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 4QMNJ62jg6zfNv; Thu, 18 May 2023 08:22:30 +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 34I8MUeF063430; Thu, 18 May 2023 08:22:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34I8MU4h063429; Thu, 18 May 2023 08:22:30 GMT (envelope-from git) Date: Thu, 18 May 2023 08:22:30 GMT Message-Id: <202305180822.34I8MU4h063429@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 9064a6d5dadb - 2023Q2 - emulators/mame: fix build on armv7 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: 9064a6d5dadb703432cccee830b381102205b340 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=9064a6d5dadb703432cccee830b381102205b340 commit 9064a6d5dadb703432cccee830b381102205b340 Author: Robert Clausecker AuthorDate: 2023-05-16 23:36:32 +0000 Commit: Robert Clausecker CommitDate: 2023-05-18 08:22:19 +0000 emulators/mame: fix build on armv7 Mame fails to link on armv7 due to an address space exhaustion in lld. As a bandaid, tell lld to not generate symbols. This frees up enough address space to make mame link. PR: 271374 MFH: 2023Q2 Approved by: agh@riseup.net (maintainer) (cherry picked from commit 9fb2d7b2e7473d6bf8bb18d5e457ed4c7ac933df) --- emulators/mame/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile index 26c2b886b6a9..c2a975d1d698 100644 --- a/emulators/mame/Makefile +++ b/emulators/mame/Makefile @@ -80,6 +80,9 @@ MAKE_ENV+= DEBUG="1" \ OPTIMIZE="0" \ PROFILER="1" \ SYMBOLS="1" +.else +# avoid address space exhaustion in linker on armv7 +LDFLAGS+= -s .endif .if ${ARCH} == amd64 || ${ARCH:Mpowerpc64*} @@ -172,11 +175,11 @@ post-patch: s| .(ARCH)||g' \ ${WRKSRC}/makefile \ ${GENIE}/build/gmake.bsd/genie.make - @${REINPLACE_CMD} -e 's|gcc|cc|; s|g++|c++|' \ + @${REINPLACE_CMD} -e 's|gcc|${CC}|; s|g++|${CXX}|' \ ${GENIE}/src/tools/gcc.lua \ ${GENIE}/src/tools/snc.lua \ ${GENIE}/tests/test_gmake_cpp.lua - @${REINPLACE_CMD} -e 's|= \"gcc|= \"cc|; s|= \"g++|= \"c++|' \ + @${REINPLACE_CMD} -e 's|= \"gcc|= \"${CC}|; s|= \"g++|= \"${CXX}|' \ -e "s|'CXX =|'#CXX =|; s|'CC =|'#CC =|; s| .(ARCH)| |g" \ ${GENIE}/src/host/scripts.c @${GREP} -rl '"png.h"' ${WRKSRC}/src | ${XARGS} ${REINPLACE_CMD} \