From nobody Sat Feb 04 15:11:13 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 4P8GFF6SHRz3nVg5; Sat, 4 Feb 2023 15:11:13 +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 4P8GFF5xfmz3vfq; Sat, 4 Feb 2023 15:11:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675523473; 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=0N4owQCGaSTBkGUJbofA9GlPTgRO9wQt+v7vdCJCj3A=; b=nyAl9omZM4gqz/E1tmtP6tFiTEtccf+l5+J+2NLlqJaMhhPDoXSPr/UJIP6ejzeK9XqKFg 66UsgqDvZaKDYDqUoaHhoyc/z2Zrs+6vjHX4QM042f+sysIgk5uJkowpjNFXQ+zfZRwbNN dH6wFv4RNqeMHVDx0EPgqcalkOWpPbaEyJgmmeko1jk5iX7966BxxnDo9U5nk21D+vyncc iEFlU3SFyd6l8nXwltvp/EB1XDeG4B6TJtyCZwz3ZFQls47TdGAlk1cWbPcvaYQhqWtyMS CbJKUcRy7oZ1oemgPGWAjWWD5ZKvryWb4t3uPkooaGyZ0+iUGLNaadImBMfiBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675523473; 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=0N4owQCGaSTBkGUJbofA9GlPTgRO9wQt+v7vdCJCj3A=; b=N3LRoz1fXAOprXe0H46cJfwHTA3kd/M2GuhlGnAxJm+ugyrhP6wvyLlFejq3vOZ+uNxGj8 MN5MrJLRpz/y1pENO34Pou6X1WA/ZYPyAxzKmRC5MilzwzJjqKz5GtiGwkAZIhICkwKDOb V1+60tdut8QbZHlkQTNWZZFwWPubTp5IGix1X5GpLQ4EuN4B38JtOR1S+iKUxrzSBJxJpB 7caEuei5r9Z2QOkluwJOZXAEcWIJgCqSuy+AWrf3sgocuOqgxZ7DtzmRV6+YsmB+xR4WH8 DjPrH2QFrAFAraHYnfJ30uCJh20L5Cp6sEuDDSk1c5M5MRv1FaRCO9shIi02KQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675523473; a=rsa-sha256; cv=none; b=mECcSIAYG1JcZeha2/mZEYKq9RW6mGac8hU/qzOEgYFWRT3p5prkR03EQHUEnccCcq01iz vPhaNsJ+1mLYb/sF0b8Hh+JgWOzykDKcW+UyZY0cSXiZibT9utfBGe7vzqyLuJ8QolpwvN HUDyGKEq6njYti1Ko2ldR4tJd8mdKs7IB5VP+OoYitxYLjUUFqlKzzuNS04O8TlXo2QB1w BAEsDxeAcrP7uJIp6Vjt0s4We/F4sExcUFKlgQ/YnQLeZL4lgDSX+1ykG1MgwBbLFx8/SD x9xkPAlQbJfjcx1ljmm2jA0enqKUanSGWcpjQ4JFmG31j4c/Qfv2wJfKjr8KUA== 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 4P8GFF4jgWzJwR; Sat, 4 Feb 2023 15:11:13 +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 314FBDFV014554; Sat, 4 Feb 2023 15:11:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 314FBD0R014553; Sat, 4 Feb 2023 15:11:13 GMT (envelope-from git) Date: Sat, 4 Feb 2023 15:11:13 GMT Message-Id: <202302041511.314FBD0R014553@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 84ba2383e7be - main - games/openenroth: unbreak the port's build in pre-C++20 environments 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84ba2383e7be058b5e4f799fbe3fafeefcfb3761 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=84ba2383e7be058b5e4f799fbe3fafeefcfb3761 commit 84ba2383e7be058b5e4f799fbe3fafeefcfb3761 Author: Alexey Dokuchaev AuthorDate: 2023-02-04 15:10:00 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-02-04 15:10:00 +0000 games/openenroth: unbreak the port's build in pre-C++20 environments Pull Clang 13 when it's not available in the base (via USES+=llvm:13) and use Boost's ``unordered_map'' implementation while the system one is insufficient; avoid ``std::u8string'' for the same reason. Set LLD_UNSAFE to unbreak linking against OpenAL on i386 (ld: error: cannot preempt symbol: alGetError). While here, slightly wordsmith the installation message. Reported by: pkg-fallout --- games/openenroth/Makefile | 19 +++++++++++++++++++ games/openenroth/files/pkg-message.in | 6 +++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/games/openenroth/Makefile b/games/openenroth/Makefile index 11d8fd314767..7074cc1e72bd 100644 --- a/games/openenroth/Makefile +++ b/games/openenroth/Makefile @@ -28,6 +28,18 @@ GH_SUBDIR= thirdparty/cli11:cli11 thirdparty/fast_float:ff \ thirdparty/magic_enum:me thirdparty/mini:mini \ thirdparty/nlohmann_json:nj +.include + +.if !exists(/usr/include/c++/v1/concepts) +BUILD_DEPENDS+= ${LOCALBASE}/include/boost/unordered_map.hpp:devel/boost-libs +USES+= llvm:13 +CXX= ${LLVM_PREFIX}/bin/clang++ +.endif + +.if ${ARCH} == i386 +LLD_UNSAFE= yes +.endif + post-patch: @${REINPLACE_CMD} -e '/CMAKE_CXX_STANDARD/s,23,20,' \ ${WRKSRC}/CMakeLists.txt @@ -40,6 +52,13 @@ post-patch: ${WRKSRC}/src/Utility/CMakeLists.txt @${REINPLACE_CMD} -e 's, c++abi,,' \ ${WRKSRC}/thirdparty/luajit/cmake/src/CMakeLists.txt +.if !exists(/usr/include/c++/v1/concepts) + @${REINPLACE_CMD} -e '/#include/s,unordered_map,boost/&.hpp,' \ + -e 's,std::unordered_map,boost::unordered_map,' \ + ${WRKSRC}/src/Library/Serialization/EnumSerializer.h + @${REINPLACE_CMD} -e '/#ifdef/s,ANDROID,${OPSYS},' \ + ${WRKSRC}/src/Utility/FileSystem.cpp +.endif do-install: ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/OpenEnroth \ diff --git a/games/openenroth/files/pkg-message.in b/games/openenroth/files/pkg-message.in index d0d13d57a170..ac65d1724090 100644 --- a/games/openenroth/files/pkg-message.in +++ b/games/openenroth/files/pkg-message.in @@ -1,12 +1,12 @@ [ { type: install message: <