From nobody Sat Mar 18 20:58:40 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 4PfCyn1R8rz401n1; Sat, 18 Mar 2023 20:58:41 +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 4PfCyn0rhPz3whJ; Sat, 18 Mar 2023 20:58:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679173121; 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=+ewSsElExnWHybg5P1WH4brBhoxmgR39IWAJz4/ohK8=; b=vXr41LioNmsuas7XurRpiC/zkCSnFDpUjgWoD01ERYKcl7kl9VwAAFNTZKYgQmdNLDyClM xZfl8W10luPrJcGuks8fFmTI1rYuQb8WCiZvcQyM2oxoT6LndmTtZ4fjbHCm7jbvLhtzGy tylFgvJrRP2vdW0+NJLXyZf0oXiibJu7ue/uhkDBTkpLwUf2ZNlw9hCd/KSlsxOigZ3OQ4 2Sbf/W1zK5lqKSX9hOE3PsexcJz3yrQpV3o+eGWlls2uswG9oh/3vYBthvLBWY9mtWnkp/ AI3eeCYJteK+73FgZwFlnvwSmfhyMzykuzhiuG+2s3gk6u4Nbp6KA1Hh2xwTqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679173121; 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=+ewSsElExnWHybg5P1WH4brBhoxmgR39IWAJz4/ohK8=; b=CYttL+4+erinbmU0rC7Xq9YA/gEFzasd7fYmEOAT3N8KXUBjzZ/wTWxStYpqYX7DZ/a73B XN97T+cRuj+fJ2sIaRDXkX+j4iDQWaFKZOmGgg8V+hg/DOJEfEdb3DjCstyL1a9M5MfZ8i F2BZlAFey2DlZuiL5j0dx8LFV1EJE8mhvqHZD2yUk90KPz20CIV1rIJybHyqsiCdH4jeub GtKxgYPeQ/JMHcef12Kjz1UEIR75sC5HFOyyZafiD6Wt/voEjuVOAtVOHENnddmY8rlhlN L2ujQYlaakkpSyu+y6nFa5qaH7ueakxRoanI7+G5I3HTCO6fgqxXmgURMpBYqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679173121; a=rsa-sha256; cv=none; b=QNzP9yMM4mP/AKPII56Dh/s4hNB95p/o+uNWL42VA65W6jEioIPpx+Ka7byfDon8qBPius jzLQV9d8oeX/LKK4nycWYzGkV30Aa5Bv2e/3q68aoT4dBNFp6YfzZ8nxm7pxOGFosgUiys 9SWLjyrv2EelKfsip9oo/8HqZcpUAjnpPW2zoUoF5PHeBCxqqXZ+HgJkVTYtvBdptJSpzi 1J+lvUMBkhs2rF6h786qlbuWb4uMq5JukCuhmTo1o77OEe8aUFZdmxLjb6sC8ntMpf118L DNFnVjOaktLxFpeFFrHMI+vM+i4LAF8yZNmw0Oo2/FGwkr0BpYZaGgnJVroTsw== 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 4PfCym71DpzLsC; Sat, 18 Mar 2023 20:58:40 +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 32IKweoG067998; Sat, 18 Mar 2023 20:58:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32IKween067997; Sat, 18 Mar 2023 20:58:40 GMT (envelope-from git) Date: Sat, 18 Mar 2023 20:58:40 GMT Message-Id: <202303182058.32IKween067997@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: f2488f960dc8 - main - games/openttd: fix build with LLVM 15 on powerpc* 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f2488f960dc89761a6bd51a036168f737bb99988 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=f2488f960dc89761a6bd51a036168f737bb99988 commit f2488f960dc89761a6bd51a036168f737bb99988 Author: Piotr Kubaj AuthorDate: 2023-03-18 20:56:23 +0000 Commit: Piotr Kubaj CommitDate: 2023-03-18 20:58:13 +0000 games/openttd: fix build with LLVM 15 on powerpc* Use LLVM 16 instead: Assertion failed: (!KnownValid && "Explicit template arguments?"), function AddOverloadedCallCandidate, file /usr/local/poudriere/jails/main-powerpc64le/usr/src/contrib/llvm-project/clang/lib/Sema/SemaOverload.cpp, line 12672. --- games/openttd/Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/games/openttd/Makefile b/games/openttd/Makefile index 12ef1dbac690..48a7d231120e 100644 --- a/games/openttd/Makefile +++ b/games/openttd/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libpng.so:graphics/png \ liblzo2.so:archivers/lzo2 -USES= cmake compiler:c++17-lang cpe pkgconfig tar:xz +USES= cmake cpe pkgconfig tar:xz CMAKE_ARGS= -DCMAKE_INSTALL_BINDIR:PATH=bin \ -DCMAKE_INSTALL_DATADIR:PATH=share @@ -41,6 +41,14 @@ SERVER_VARS= USE_RC_SUBR=${PORTNAME} .include +.if ${ARCH:Mpowerpc*} && ${OSVERSION} > 1400078 +USES+= llvm:min=16 +CC= clang${LLVM_VERSION} +CXX= clang++${LLVM_VERSION} +.else +USES+= compiler:c++17-lang +.endif + .if exists(${LOCALBASE}/lib/libSDL2.so) _SDL_VERSION= sdl2 .else