From nobody Sun May 21 17:26:39 2023 X-Original-To: dev-commits-ports-main@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 4QPSDb5m00z4CFcM; Sun, 21 May 2023 17:26:39 +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 4QPSDb51bdz3mBM; Sun, 21 May 2023 17:26:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684689999; 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=XAp5waS5OeU30FAtR6DWko/P6FE7/ZpPTP1n/2o3EOU=; b=scEDosVjHRIf47Mf5PQcRkOBEBwAnDcZ0HS0LTC4k509wvgqOc5ZtTw+c82mU05qn1kJ/X Yx8byEbyJkGubKz9VL3792HsuMTOH5cgOBbyWAJ2hio5bZ9uPJiJC5fnbDXPO10ca/jBUb QdWLH0JxQcchVIiw62KUAQqHLPIRqopg9yhG6c0IyN2UFd/B4r6bke4c3gr0R6izRL4pRn J2quF7PdXs6BpRcifmOHViQZBJj4qOPw+VTaOsaFakNDeQvhaYlmICnd45DbUxO0/HQv+f WK+Vrri0cuKs012ZrQhhxVmfbEVXKCTa27xBpuQEvn0nt+kDAVH9lF5IWxYxNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684689999; 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=XAp5waS5OeU30FAtR6DWko/P6FE7/ZpPTP1n/2o3EOU=; b=eATaDqCYcjDlTtPYoThhRXy3b5E1316zyFG2Nfe85nD3EMFLvLe6dEhLs2qYsqNCBRgqrj Zy1h++v7IhnjI775/Wh4Vf+TdOZ+eocT2xYdPTjMpJ74pSTmL6OcA8DN/LKmrSAq03T9Ul tAWa/IBBM1xuZ8qHR0DjjEUer0IttrS7O3fYWxfeg2A0UIlxicKiJ8DsHpxQ0BAVftEPGQ Ra3JvlK8Jtfl1ueCVtOYS2aNZAyOOyfLBaskSRIw++eH14uScYhDT2luScZjB9yaH8GCPd ziifeYxWnRLYmGjdpO+LlM7gK7UEWlZkhVFo7JnUfM1X1qRGxAJ5wBLwp0isHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684689999; a=rsa-sha256; cv=none; b=QgpH6u3PtTVAgv72Dpi5aifONuJqy//zvtF35z8il40GimGh72wVBDZEALYJVda449Dp71 8oh/labR/HLbzOiwziy05fVCSePEAyGX0IZKXxc9pJJc9BbT8rQFf6xZwkO7odRRRbjP20 HP26U6SL4yRKn1WsYKMWZ9BlLWHsJ+URQqJnh6dJEEUpte9iCVZYQr39qyMhjjCiUQTmkh ae5QVWbNhk2Tz1QhazeYW3U6NnRzkX2ppC8rkD3Gd8q8OCaq1igg6P3azwsRKyY1+xd8Ij VN6TXxTDthxRFCv8JaIlAXkEm1ZAnRjkWo/euQpSnUM/kFOJAVON1VZrTlNV/A== 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 4QPSDb43Mpz10k7; Sun, 21 May 2023 17:26:39 +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 34LHQdHs065438; Sun, 21 May 2023 17:26:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34LHQdMY065437; Sun, 21 May 2023 17:26:39 GMT (envelope-from git) Date: Sun, 21 May 2023 17:26:39 GMT Message-Id: <202305211726.34LHQdMY065437@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 35a33a5fa5b5 - main - games/openclonk: Fix link on 14-CURRENT i386 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 35a33a5fa5b5da7b48d7401435403461796680e0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=35a33a5fa5b5da7b48d7401435403461796680e0 commit 35a33a5fa5b5da7b48d7401435403461796680e0 Author: Kevin Zheng AuthorDate: 2023-05-18 21:53:29 +0000 Commit: Robert Clausecker CommitDate: 2023-05-21 17:25:43 +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 --- 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