From nobody Mon Jun 26 23:28:05 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 4QqkY162Vyz4kL7Z; Mon, 26 Jun 2023 23:28:05 +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 4QqkY15Jlmz3v6H; Mon, 26 Jun 2023 23:28:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687822085; 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=h6iII61ZoBqNimLC6p1IeDiLEN5USDV6rqe41iInyVU=; b=rMxntF5mcK3mC4TWl0ktf/x0Ko5JnCSXr8E3SPIFLmrfU6/8Jm/qtC7We/4rb2PFxdQGkX VqpJrpjdbnTnMEq7kyWMSS1c/+Gesl2ZfaXamdep5AcKVDQCisybUVIIgG3buC/9KmbmRR IVv8nFVyHiWYP6hnkLvYtfIB2TKu3XuIyVxEPfHwrgBcGAbds0yQEMXKVl6fRRf/5pY1rk 2fwgumCsNSitccCR4pgVE5OqNKKWmIjxBHjvcetBI9Boky4+QZh02aoqEJ2aKWpGOFsPut iL0IkP/ej1TKRlLnJXxlfWDdTZklVnymg4rflhf8/edKZA4p6pklNpczWSPXhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687822085; 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=h6iII61ZoBqNimLC6p1IeDiLEN5USDV6rqe41iInyVU=; b=njTYcUZDnQ25eoaW/EaQtpHmVJBxIrvCxfNmg2ac8SVQco24wntGPQHCPIDZ4BQMIfoS8a OdSPbskyv9JqVemihYu3362gq3d1zA3MIoPumtQQ4heUPgyMrhbGlwD3O/pv8uWjt+rVcC npWItasmjYQ3epCgo1ViBiItUj4Ig4YzSl3wcNgF5J1x5MCl1PJ+wLpHk7r81ggeQ3dn/p UjPBa238RJU2/s6DdUgnGPhTdXbZuhSREGnm7BwZFKkWui8NFhPSXYNZzE6VNBO/e1xdjK 0ATMo0prPOZcxnM+1io/g3inPsE5jWuNKohmmv2Af70rn4F+tFV4on1LtgR1RA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687822085; a=rsa-sha256; cv=none; b=qbh4cvpm6efaskePjzj1jbMhLrFzQqD9Bx+EIzbATAJl5AM6UuKIvsOQftK+YT7BGjs91y MODmfTswULxUyimBBW2cQ82c4nvLMFkI6+Cih9lKZZJ65P5/eAtF3D27l2yvDPD/KWLKzs h2LLm5EyqmcXeJpleADA49qCFgoMl9htKD2DHjROefiPwquJl4EtjSHPaa4wqdKohnB7Et wuGZj2/vwa0AAD5tGWmzsgCHkrJm/Q9/MWB45BZ+a3/cc8PYjeK0qu6OC2JUXjCXn7vAYO LVDOW0T0PuCh66pzLYzoPSXctpwOauWB5cqbO3TFDqv1khe/NAdQfuoQmTEqaA== 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 4QqkY12BW4zTrL; Mon, 26 Jun 2023 23:28:05 +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 35QNS5De016245; Mon, 26 Jun 2023 23:28:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35QNS5EC016244; Mon, 26 Jun 2023 23:28:05 GMT (envelope-from git) Date: Mon, 26 Jun 2023 23:28:05 GMT Message-Id: <202306262328.35QNS5EC016244@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: 658a65e0dab3 - main - games/assaultcube: 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: 658a65e0dab377a6bdd4ca9ff792f9e21cad8a53 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=658a65e0dab377a6bdd4ca9ff792f9e21cad8a53 commit 658a65e0dab377a6bdd4ca9ff792f9e21cad8a53 Author: Kevin Zheng AuthorDate: 2023-06-17 20:32:28 +0000 Commit: Robert Clausecker CommitDate: 2023-06-26 22:58:23 +0000 games/assaultcube: Fix link on 14-CURRENT i386 Fix build on 14-CURRENT i386 by disabling dynamic relocation checks with lld 15. PR: 272049 See also: 145ca5487348 --- games/assaultcube/Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/games/assaultcube/Makefile b/games/assaultcube/Makefile index e8a45f11bd3d..6a48b1ece42e 100644 --- a/games/assaultcube/Makefile +++ b/games/assaultcube/Makefile @@ -18,7 +18,7 @@ LICENSE_PERMS_ACUBE= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_CUBE= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_OTHER= dist-mirror pkg-mirror auto-accept -USES= gmake tar:bzip2 +USES= compiler:c++11-lang gmake tar:bzip2 USE_GITHUB= yes GH_ACCOUNT= assaultcube @@ -41,7 +41,7 @@ DEDICATED_DESC= Build dedicated server CLIENT_LIB_DEPENDS= libvorbisfile.so:audio/libvorbis \ libcurl.so:ftp/curl -CLIENT_USES= compiler:c++11-lang desktop-file-utils gettext-runtime gl openal:al sdl \ +CLIENT_USES= desktop-file-utils gettext-runtime gl openal:al sdl \ xorg CLIENT_USE= GL=gl SDL=sdl2,image2 XORG=x11 CLIENT_ALL_TARGET= client @@ -57,6 +57,12 @@ DEDICATED_PLIST_FILES= bin/${PORTNAME}_server libexec/${PORTNAME}_server #MASTER_ALL_TARGET= master #MASTER_PLIST_FILES= bin/${PORTNAME}_master libexec/${PORTNAME}_master +.include + +.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150 +LDFLAGS_i386+=--no-check-dynamic-relocations +.endif + post-patch: .SILENT ${REINPLACE_CMD} -e '/^CXXFLAGS=/d ; /^CXX=/d ; /^CLIENT_PCH/d ; \ /^INCLUDES=/s|$$| -I$$(LOCALBASE)/include| ; \ @@ -81,4 +87,4 @@ post-install-${f:S|server|DEDICATED|:tu}-on: ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}_${f} .endfor -.include +.include