From nobody Wed Mar 29 12:51:00 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 4Pmmd04hwqz42Wfh; Wed, 29 Mar 2023 12:51:00 +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 4Pmmd04GKxz4DCX; Wed, 29 Mar 2023 12:51:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680094260; 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=Edk9qhCMhyIa6GT5hFsIHKqEdKFoNtRwWujeGosHQx8=; b=B/hR0G/alTxoApnAplCAc2xsagdjsxck6Gu2Oh7E4Eyq0xGq3pOXitSJfCrfLDFZWkH8Nr j86qXCgeBTgEjXzpTTZd176aUBc1gmhUhxNqYmK26RMXCSIZ/gH4k6CqOYWqHIYMYoyBnE mlAJCFU9qsdzHuXvUO5kc39mGixKThzePy6OYrP8rLzUTOY0jJHaOrylBkz0z0+W4kIf2y vWUP2s8BVjbHCf91STb4FZ28oqLtbwqBkMY8feWn08524hFO+Ag3QV54lBctk8cajGpD5c jusxoXibtmWOAB3MxCZKmMFbGf0JStnFlKBkoq4kw68BsVsQzqtLfFuX9BFUHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680094260; 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=Edk9qhCMhyIa6GT5hFsIHKqEdKFoNtRwWujeGosHQx8=; b=XdHZM6aQKxI3c5FAlqE1TGuDBfdwDbSRcOfoB6NudZyRWGlz2cRh7Roo3Zd8/8ub75n0gq gw1C8jmwBvz2TmFL3LQ2H6gHvr1oHJSccy5/N4S0fj+In4CjhL+lHa3aYryXN68sreuMnJ IIU4hLQTtDGfw/iYKr3q6CNZ40h8zSGg8iKhg1zVY2zHS68Wzgb3agEgStFWLofaGUnKar 0UbLw1yEuWie4WQLqBQ9ueSjMzwI0ThhgQjy6z+UGec4J4PXrX8BcOvt5Wik85n4ZLPshh nCg2BDpP8PqcQFnf2EhPxbitj+PMWmYTQ7i9C5mJxJPli8VAnq+I8jc4j/YwHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680094260; a=rsa-sha256; cv=none; b=XrMnJqrE1526j1D9NAtCzU4LONrjZvAXEoVn40vhT9NzXGY9s9BL2FM/SyPXGQ9Nqc1eSC GeQIRq2HcZuPvriuEQZdtoQx2H/kzQ4aGvpJPFiTyP1bGfKnq85u9Ar2xBaO6b1juDLT5o 1XykoYcYM5UT2QnL8N3AjguDs7lsrbZ6q4//WJJonhhZBgmQ14/T8QBlmh1JSr7N1p7j5v /xZ0u6Q/+RBdMZ5id5Ink1yziuheC8vDyXQqa9OeZgV+2r9PaEIqc+re9ITqtx5twy9TwJ fcgho06x7iPeMTIWJX4Lua223/9ASfVnvHwySJgg9x1s3i8FestP2eXgN3rWJw== 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 4Pmmd03LF5zWQZ; Wed, 29 Mar 2023 12:51:00 +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 32TCp0PB040559; Wed, 29 Mar 2023 12:51:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TCp03v040558; Wed, 29 Mar 2023 12:51:00 GMT (envelope-from git) Date: Wed, 29 Mar 2023 12:51:00 GMT Message-Id: <202303291251.32TCp03v040558@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 7c66e4fef49f - main - games/megaglest: unbreak on -CURRENT i386 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: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7c66e4fef49f10053e6a9c844baf312b1a148a52 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=7c66e4fef49f10053e6a9c844baf312b1a148a52 commit 7c66e4fef49f10053e6a9c844baf312b1a148a52 Author: Thibault Payet AuthorDate: 2023-03-29 07:21:07 +0000 Commit: Fernando Apesteguía CommitDate: 2023-03-29 12:46:24 +0000 games/megaglest: unbreak on -CURRENT i386 PR: 270265 Reported by: monwarez@mailoo.org (maintainer) --- games/megaglest/Makefile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/games/megaglest/Makefile b/games/megaglest/Makefile index 7452be6ff2f6..5dd2f1fe3c36 100644 --- a/games/megaglest/Makefile +++ b/games/megaglest/Makefile @@ -49,6 +49,16 @@ VIEWER_CMAKE_BOOL= BUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS \ BUILD_MEGAGLEST_MODEL_VIEWER VIEWER_USE= WX=3.0 +.include + +# The following is actually meant for lld 15.0 and later, but the ports +# framework does not support LINKER_TYPE and LINKER_VERSION yet. +.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150 +# Turn off checking of dynamic relocations, to avoid lld diagnostics about +# possibly incorrect addend values. +LDFLAGS_i386+= -Wl,--no-check-dynamic-relocations +.endif + post-patch: @${REINPLACE_CMD} -e 's,/usr/local/include/lua51,${LUA_INCDIR},g ; \ s,/usr/local/lib/lua51,${LUA_LIBDIR},g ; \ @@ -78,4 +88,4 @@ do-install-VIEWER-on: ${INSTALL_PROGRAM} ${WRKSRC}/source/g3d_viewer/megaglest_g3dviewer ${STAGEDIR}${PREFIX}/bin/megaglest_g3dviewer ${INSTALL_DATA} ${WRKSRC}/mk/shared/g3dviewer.ico ${STAGEDIR}${PREFIX}/share/pixmaps/ -.include +.include