From nobody Sun May 21 17:27:38 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 4QPSFk4ZDYz4CFcf; Sun, 21 May 2023 17:27:38 +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 4QPSFk3ZSrz3msm; Sun, 21 May 2023 17:27:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684690058; 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=NzDcOq0NFaFicHv1bLuElHcWGj1bMaUsaDE4iLvHSRA=; b=a9a1voDwlUEDHuzpJOwLTC4eC1p6ajDXVp9J67bwTEAn0poY6Rr/mnNzJcdExnrhHqFx8s jgIZQg+c94GOTNrQVo1Jr8+ajb23VLqVSQ+23YzZMFnv9guR9yzSCuJxiIwGu9Vdmvt6Rf VJij+/fvsii6FrMCCO2wkBDH+WsZ6P9BjjDDu0uv/eEK1+Yw/Z/CzPe5Nf6DTSBZyDzTEb hj7pEjLOsHW3P6CzbZJj+6WKhEF/8d/xhRL6BD1Uwl2mt7EZ782lpwBNptQ1GC1QYl5kNW kMcc+ZudHx1qfaFg+6/qf4+TOfhAFqhUu1hJcaddw2Knqb7g8wz90ncXoNpFnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684690058; 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=NzDcOq0NFaFicHv1bLuElHcWGj1bMaUsaDE4iLvHSRA=; b=dyA93Ph17ZQSMPy0ffMwlV0pz1l+E1Gmx56nbtQiWLdikiZKcL7VWTGGz2h8eoNC0srKqF +OsOsSCiA0BBShljo+lAdowWvoUI8Gci9TLFfX5xpxNcrHagZByleFB/xBn7Tg60Eit2Hs /rnCELQiPWEUaMvrxGPLEW6MXAc1dIgtYZPw2PE+pQRVpsRs3Iw5ZjE0z3dot50stWSIJU 5ar2/VYosDrCYgLxKc1mXRdm7cutKReaoH/q6jeiUKoXnWDmByYvMJFl749bDuMXwoYCzK 41IsJ2K3R4gaTd482rEEaKLetuih4eGA546isqKNmOazekBz+BH79tsW3x7Jow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684690058; a=rsa-sha256; cv=none; b=ZuF8+jcK957pZI4uz9zksoOQ7uQLf+Pk4CppGUi9dv4dgucm2CNV10B9mtjnHPG/dGiHDX L1c3lhyX/S56nsdVdHz2NBb7cat4xZ9xAUGgvdKlnzE2pgHiSfmU46EIDcTXQpDw+xzCXQ bYjds2X6RhWPmxnzAyMwfL3f9YUpvELrClA95Hyq67+cKG67V6tG9SrUaIabtRA96NA7NG 3dR1KRiy4lyAkN52boIqeJTsMvogY0CzZE3VOfXbcfFVAgdA4qBxTaisVJHyUtahMPxhgD Unif+SUKj1l8UH3i11IvbIjmx9WpMrlsOC3nLkmgSgzJy9QHZxWc1tuD/KH84g== 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 4QPSFk2VZQz1045; Sun, 21 May 2023 17:27:38 +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 34LHRcNq065857; Sun, 21 May 2023 17:27:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34LHRc14065856; Sun, 21 May 2023 17:27:38 GMT (envelope-from git) Date: Sun, 21 May 2023 17:27:38 GMT Message-Id: <202305211727.34LHRc14065856@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: 8eb2398e0b7b - 2023Q2 - games/openclonk: Fix link on 14-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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: 8eb2398e0b7b307df5ed20c738648b08aa557c7f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=8eb2398e0b7b307df5ed20c738648b08aa557c7f commit 8eb2398e0b7b307df5ed20c738648b08aa557c7f Author: Kevin Zheng AuthorDate: 2023-05-18 21:53:29 +0000 Commit: Robert Clausecker CommitDate: 2023-05-21 17:27:20 +0000 games/openclonk: Fix link on 14-CURRENT i386 Fix build on 14-CURRENT i386 by disabling dynamic relocation checks with lld 15. While here, since this port is BROKEN_powerpc64, remove the old powerpc build flags. PR: 271500 MFH: 2023Q2 (cherry picked from commit 35a33a5fa5b5da7b48d7401435403461796680e0) --- games/openclonk/Makefile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/games/openclonk/Makefile b/games/openclonk/Makefile index 46a6d9ba5675..dc565d626eb9 100644 --- a/games/openclonk/Makefile +++ b/games/openclonk/Makefile @@ -27,7 +27,7 @@ LIB_DEPENDS= libalut.so:audio/freealut \ WRKSRC= ${WRKDIR}/openclonk-release-${PORTVERSION}-src # make install has parallel issues with ninja -USES= cmake:noninja desktop-file-utils gl gnome jpeg openal \ +USES= cmake:noninja compiler:c++14-lang desktop-file-utils gl gnome jpeg openal \ pkgconfig sdl tar:bzip2 xorg USE_GL= gl glew glu USE_SDL= sdl2 @@ -35,17 +35,14 @@ USE_XORG= x11 xpm CMAKE_ARGS= -DAudio_TK:STRING="OpenAL" LDFLAGS_i386= -Wl,-znotext -.include +.include -.if ${ARCH} == powerpc64le -CFLAGS+= -DNO_WARN_X86_INTRINSICS -USES+= compiler:gcc-c++11-lib -.else -USES+= compiler:c++14-lang +.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150 +LDFLAGS_i386+= -Wl,--no-check-dynamic-relocations .endif post-patch: @${REINPLACE_CMD} -e 's|DESTINATION games|DESTINATION bin|' \ -e 's|share/games|share|' ${WRKSRC}/CMakeLists.txt -.include +.include