From nobody Sat Apr 13 18:55:39 2024 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 4VH2gv6Jg8z5Hwmt; Sat, 13 Apr 2024 18:55: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 4VH2gv5phTz4dgZ; Sat, 13 Apr 2024 18:55:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713034539; 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=O0BPHtuV0uswrt7g/y2SDmShCH1FclnsK9EuBbZyTpw=; b=kPmQcrFBU18ndJBLLq/PbSA+V73Kob4CnYE3sHsm7MUfTs4NNzwB7N6V80o27BWdYZD/pH GGSIsNjohsZ3ruLVcNpFRp1u4XWZMMNy5L3SnNbxffiA1HsNlmxCY0KtvWqMyLjFV8Zw+2 QfMn//NnGLjRMg48WG33uMlqvX/eYVlaCs9GquEpTocPQ/TxaC5p/abf+MG9AGbj/kRash etMqYIwlWZ9/Z0cHk4yzyXAEdBp4iqaMnxgyAP9Hp0qzTHqLwVE7mEvbA/0I6ugWzEUH84 rWGE/AFzMDDtn4BMTlY8F2g8lJQtSHJTpj1r6Q7XCIHiy0cgkOxzwmlcsBKEAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713034539; a=rsa-sha256; cv=none; b=yZsy/1ErCopihPX3JtXHfkjYHzsgw+gepo6jIHkIrEoN1BX1IFyzDYoirJ7l+qdGSYml2q RFWqffEmBzYPQOOnpiVwW+KECp7YXKTl3aKFrNEFtQiEHmrIh2Rm33UftRt472ZarTnRJ7 edjuAZxDSE4xqHnesXuf1rkPsRaPpJlaIdIv+ZD45xUJKBpU1e9frYpPSLhylVNR1BMnz1 2UR/F6Uf/mrm4VS35vZRQYUi8Ii7SJBFA6q9Sq8ajguLiwAY7WkXn8LZSxTL4ZJbpBjIzI ksLgOlMHdnX5Qarn+2a8VgKjbH/rPl8kvfw2naoYEnWxX6kpHESCtdsqpjrbpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713034539; 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=O0BPHtuV0uswrt7g/y2SDmShCH1FclnsK9EuBbZyTpw=; b=XG86LKY/yeONTyAGs3GJdT8GCjqCf4kgX+Z2V6IQZakcpz7jXuqPdN8Cwc9VsfrdAwuKsm Y0XXOEVtxxuymOe92KvVW/TM6iTVMOURcyfap15aZGIDFBNKhz0DiREWFJcDACZUGZ1QJF vZJs0s5BQmmSn9oAMg7VEPGyc4M6FHPU0Eil8e03SGraN07Kd0So0d6Ay7mmwSCmDixbhj 8E5hPtABNe7IbqHsZSLza8JfKjs2DOlsRojP52lszlneRAnqNBStB1mxioqUzLiGvzpR3s vXv4YIshIjHvZfVdMBfJJ0oyt3QjsL/OE/s+Po1Fro6y2AMFeio0dR/hkiGhyQ== 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 4VH2gv5Pyrzl2T; Sat, 13 Apr 2024 18:55:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43DItdUS088305; Sat, 13 Apr 2024 18:55:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43DItdFG088302; Sat, 13 Apr 2024 18:55:39 GMT (envelope-from git) Date: Sat, 13 Apr 2024 18:55:39 GMT Message-Id: <202404131855.43DItdFG088302@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: MANTANI Nobutaka Subject: git: becbb72040d1 - main - editors/imhex: Fix build error on 15-CURRENT 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: 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: nobutaka X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: becbb72040d1686c2325ca8afa40e9ab6f75c229 Auto-Submitted: auto-generated The branch main has been updated by nobutaka: URL: https://cgit.FreeBSD.org/ports/commit/?id=becbb72040d1686c2325ca8afa40e9ab6f75c229 commit becbb72040d1686c2325ca8afa40e9ab6f75c229 Author: MANTANI Nobutaka AuthorDate: 2024-04-13 18:50:29 +0000 Commit: MANTANI Nobutaka CommitDate: 2024-04-13 18:55:07 +0000 editors/imhex: Fix build error on 15-CURRENT --- editors/imhex/Makefile | 20 +++++++++++++++++--- ...xternal_libwolv_libs_io_include_wolv_io_file.hpp} | 0 ...b_libimhex_include_hex_api_content__registry.hpp} | 0 ...xtra-patch-lib_libimhex_include_hex_api_task.hpp} | 0 ...ins_windows_include_views_view__tty__console.hpp} | 0 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/editors/imhex/Makefile b/editors/imhex/Makefile index 9fd3f62c983f..5b24f85eada9 100644 --- a/editors/imhex/Makefile +++ b/editors/imhex/Makefile @@ -86,20 +86,34 @@ PORTDOCS= README.md OPTIONS_DEFINE= DOCS NLS NLS_USES= gettext +.include + +# Before LLVM 18 import into the base system +.if (${OSVERSION} < 1500018) +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-lib_external_libwolv_libs_io_include_wolv_io_file.hpp \ + ${PATCHDIR}/extra-patch-plugins_windows_include_views_view__tty__console.hpp \ + ${PATCHDIR}/extra-patch-lib_libimhex_include_hex_api_task.hpp \ + ${PATCHDIR}/extra-patch-lib_libimhex_include_hex_api_content__registry.hpp +.else +CXXFLAGS+= -fexperimental-library -D_LIBCPP_ENABLE_EXPERIMENTAL +.endif + post-extract: ${CP} ${DISTDIR}/${DIST_SUBDIR}/xdg.hpp ${WRKSRC}/lib/external/xdgpp ${CP} -R ${WRKSRC_capstone}/* ${WRKSRC}/lib/external/capstone ${CP} -R ${WRKSRC_fmt}/* ${WRKSRC}/lib/external/fmt - ${CP} -R ${WRKSRC_jthread}/source/*.hpp ${WRKSRC}/lib/libimhex/include ${CP} -R ${WRKSRC_libromfs}/* ${WRKSRC}/lib/external/libromfs ${CP} -R ${WRKSRC_libwolv}/* ${WRKSRC}/lib/external/libwolv - ${CP} -R ${WRKSRC_jthread}/source/*.hpp ${WRKSRC}/lib/external/libwolv/libs/io/include/wolv/io ${CP} -R ${WRKSRC_nativefiledialog}/* ${WRKSRC}/lib/external/nativefiledialog ${CP} -R ${WRKSRC_pattern_language}/* ${WRKSRC}/lib/external/pattern_language ${CP} -R ${WRKSRC_cli11}/* ${WRKSRC}/lib/external/pattern_language/external/cli11 ${CP} -R ${WRKSRC_yara}/* ${WRKSRC}/lib/external/yara/yara ${MKDIR} ${WRKDIR}/.build/_deps/imhex_patterns_src ${CP} -R ${WRKSRC_imhex_patterns}/* ${WRKDIR}/.build/_deps/imhex_patterns_src +.if (${OSVERSION} < 1500018) + ${CP} -R ${WRKSRC_jthread}/source/*.hpp ${WRKSRC}/lib/libimhex/include + ${CP} -R ${WRKSRC_jthread}/source/*.hpp ${WRKSRC}/lib/external/libwolv/libs/io/include/wolv/io +.endif post-patch: ${CP} -R ${WRKSRC}/lib/external/libwolv/* ${WRKSRC}/lib/external/pattern_language/external/libwolv @@ -108,4 +122,4 @@ post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} -.include +.include diff --git a/editors/imhex/files/patch-lib_external_libwolv_libs_io_include_wolv_io_file.hpp b/editors/imhex/files/extra-patch-lib_external_libwolv_libs_io_include_wolv_io_file.hpp similarity index 100% rename from editors/imhex/files/patch-lib_external_libwolv_libs_io_include_wolv_io_file.hpp rename to editors/imhex/files/extra-patch-lib_external_libwolv_libs_io_include_wolv_io_file.hpp diff --git a/editors/imhex/files/patch-lib_libimhex_include_hex_api_content__registry.hpp b/editors/imhex/files/extra-patch-lib_libimhex_include_hex_api_content__registry.hpp similarity index 100% rename from editors/imhex/files/patch-lib_libimhex_include_hex_api_content__registry.hpp rename to editors/imhex/files/extra-patch-lib_libimhex_include_hex_api_content__registry.hpp diff --git a/editors/imhex/files/patch-lib_libimhex_include_hex_api_task.hpp b/editors/imhex/files/extra-patch-lib_libimhex_include_hex_api_task.hpp similarity index 100% rename from editors/imhex/files/patch-lib_libimhex_include_hex_api_task.hpp rename to editors/imhex/files/extra-patch-lib_libimhex_include_hex_api_task.hpp diff --git a/editors/imhex/files/patch-plugins_windows_include_views_view__tty__console.hpp b/editors/imhex/files/extra-patch-plugins_windows_include_views_view__tty__console.hpp similarity index 100% rename from editors/imhex/files/patch-plugins_windows_include_views_view__tty__console.hpp rename to editors/imhex/files/extra-patch-plugins_windows_include_views_view__tty__console.hpp