From nobody Sun Apr 21 05:11:09 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 4VMc0t054Wz5HSPB; Sun, 21 Apr 2024 05:11:10 +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 4VMc0s6FB3z4PgX; Sun, 21 Apr 2024 05:11:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713676269; 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=mi4FEQu4oRTA8FrzS/zBeFG89SEge7Zk5gbb6ChnXiw=; b=SgKCtioWvD75o5djkbmykHCiaon3kLpiO0B8/6E0EfeOuxyQFWCh68fwi/0c5vGogEiQ+o FEqvkBmlnhzS+dccpnZAAxwumQGzHmbgBD3bVVXaf7v9ZFWWa5cR6MZYIE0aqZfDrCQGR/ 9TW4Rwp7DSHYyqXzQPSU4j7IfGPR4DcGhkucUDuJHO/9/h4lhendFl5Tg/t3Zww0Z3SwMV kpuf+rlwe0bOOFzpZFsmuesUwiV5MlT6wmkpj4ptecVZY5k6UGozWyWF40F81EvQHNIW0Y dnp1CZ4BQq186UQuK7iNvnX4fEzMltxdVGTz5biMLQJY06ezQI11ueFXxuqphw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713676269; a=rsa-sha256; cv=none; b=o48irE/tIv02rNlbSwWctfVJh5uHQRzQnd+bM/15xfio3AkIRe3ZGxbFSA5Cfequ96X9AP I5GpAdGN1s0M1rZdTMYuP6/OPvdTSFXpa6edtlBLI2W6g9EinMsNn+e7iLQ0cP18CUwCRQ XLZJLksD6gqIF5XC0SOJnbLCMSkQwkaYVHeRDcNt2guD+lPQBTicKLGUO0HnbDx/+3Bhnk uPIHMHvAM8VPmwYiW8YFhn6IozzrdsWV1pmpfPs+TeqIPS+CTXB9s7ETqXbOu3wpf+f4Og qLkVxpG7dkEkeyN28geq2B06eJ3dE9tWkX/pZ8wCp3AOQtLUIkweN94ZZIH/VA== 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=1713676269; 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=mi4FEQu4oRTA8FrzS/zBeFG89SEge7Zk5gbb6ChnXiw=; b=ZEmZx3HabBSLfNxsqkAW8d33VlgUstdx8ajKo9MtV/mIvGcCCTC34ujG/0Tmmn3Cn7QOO1 d1t05ngwGSBk54w7lj7zN9xIVb/Cp0EqVyD0y2ZXEmTgTRzm3AdlGmx7P+uua/uWoQ1qme bYh4J9WZAsLa9pjulgeHVHnmHxWDdxfsGKnIodRwWblxhAKVbzUurph/OrCyl86+73LXkb ti72iYub7vEG8kAcGZ6xd3Q6JwMgidl9/qvhQuTHJCS/+0BBxCmJM3ZribQieX+4ww35p3 hMldjcbDLoMGN3aaoVth2DNcNqGr2ZdeRV53eQmTLOES8jvnVJZaKv/fPOISAg== 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 4VMc0s5rpvz16xc; Sun, 21 Apr 2024 05:11:09 +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 43L5B9xh012345; Sun, 21 Apr 2024 05:11:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43L5B9Ex012342; Sun, 21 Apr 2024 05:11:09 GMT (envelope-from git) Date: Sun, 21 Apr 2024 05:11:09 GMT Message-Id: <202404210511.43L5B9Ex012342@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: 3e096293a981 - main - editors/imhex: Support {13,14}-stable after LLVM 18 import 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 Sender: owner-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: 3e096293a981a783839ff8778f1fe64f818a5b31 Auto-Submitted: auto-generated The branch main has been updated by nobutaka: URL: https://cgit.FreeBSD.org/ports/commit/?id=3e096293a981a783839ff8778f1fe64f818a5b31 commit 3e096293a981a783839ff8778f1fe64f818a5b31 Author: MANTANI Nobutaka AuthorDate: 2024-04-21 05:08:51 +0000 Commit: MANTANI Nobutaka CommitDate: 2024-04-21 05:10:35 +0000 editors/imhex: Support {13,14}-stable after LLVM 18 import --- editors/imhex/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/editors/imhex/Makefile b/editors/imhex/Makefile index 5b24f85eada9..d0f14aae9060 100644 --- a/editors/imhex/Makefile +++ b/editors/imhex/Makefile @@ -89,7 +89,9 @@ NLS_USES= gettext .include # Before LLVM 18 import into the base system -.if (${OSVERSION} < 1500018) +.if ((${OSREL:R} == 15 && ${OSVERSION} < 1500018) \ + || (${OSREL:R} == 14 && ${OSVERSION} < 1400511) \ + || (${OSREL:R} == 13 && ${OSVERSION} < 1303503)) 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 \ @@ -110,7 +112,9 @@ post-extract: ${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) +.if ((${OSREL:R} == 15 && ${OSVERSION} < 1500018) \ + || (${OSREL:R} == 14 && ${OSVERSION} < 1400511) \ + || (${OSREL:R} == 13 && ${OSVERSION} < 1303503)) ${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