From nobody Sun Apr 21 05:11:08 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 4VMc0r5dXpz5HSh9; Sun, 21 Apr 2024 05:11:08 +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 4VMc0r4zBsz4PvW; Sun, 21 Apr 2024 05:11:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713676268; 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=Sb3EnqDBdumLFlBrHUdcXb37L6B9G43oBOJwGA7RoGE=; b=XU3+PbQF9utzrg1AN2OqSrjy2uxLzpvYvdXomeG5Rk7xbPhJhPcFHYbUETOESPNuUialpr LB5Q4WkOr2AKqgJ3+iLIw7xwirGefafb6FqaDvCrDDON8VLsHLeMnFTSufSNLvQ6PA5vCP DzgACH+ca6PTELTbD1+mkJwKoQzJlw67pAkRkzQbz2cmE+Cl406/NpHzqqrinpPhn4TOPx /UhLMTAuWlrOI0BUMLoGLGdqjZWeAB8jjTevWxQuJSUakyNL8TSQPzlFvw1KJlPXi/L0iJ fU+BlANlPNT2BtgWyzK1ZMb8+U7ByBPleDMHAIPsNwppEnWmRhuSFn5WbUP2lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713676268; a=rsa-sha256; cv=none; b=lDHbIb972ACgjx4/KZyBHULhIThh+mrfOn35cMLbP5p/plOFGlXFukup8pUguZzFpAhTFZ VpChkSHFHDSL3vrLfqvuHN0VouFeC13OCTojvny/SlQ+7JBpQti29EW8CRe0qrE2K6Ibfg Eic/HnSOr6ZOcTTYbonuLy2CvQeIYRqTjfvEDEYCZ/cImfolY/pGm5JqZAORF2zPtfVlcd lhijMR9TTqWOYuTn8JiLEn+YhKx8cQKrFaKozoJrAtK+MSa5YqRIzR1BAMDN5mZxw1jImu ppo3430iH9L4bqcyN/5zg8cOTzle1iylSpYSB663KEo093thIauv1t6TGoQ/iw== 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=1713676268; 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=Sb3EnqDBdumLFlBrHUdcXb37L6B9G43oBOJwGA7RoGE=; b=bA2wB/q6y6VqIMKoU4Mm1iLUteFI7kIr5GDHGB2zzl5jz+52lX1mK2esTINVUaw/WqgmRZ pdNfjVm4LK3CwcloVGsVW2mA8ezGXqOi7XYUhRWGUla/uVslbp8e9U+ztnbGQzVoiT4Hbp mJg8+jzx9J1vlRAFrN0Pd1HsTC9cLbkEQf41g+DInB7Tza89tRYfa9esiOIEQdjRu8Isua tQ3PeuhjOEHxuRnLkwlf66hS0Qf2C0HUk6EoM1G8TxIpfT/cOkTUbtJ81tg9jCH8UMHgla /iwWjUzGZUqcHuLWJudxXNFqxLVtOvMQJbVrld/CUllQEGY6KmJE6WTg92tyCg== 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 4VMc0r4ZZVz16XH; Sun, 21 Apr 2024 05:11:08 +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 43L5B8kS012297; Sun, 21 Apr 2024 05:11:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43L5B8sn012294; Sun, 21 Apr 2024 05:11:08 GMT (envelope-from git) Date: Sun, 21 Apr 2024 05:11:08 GMT Message-Id: <202404210511.43L5B8sn012294@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: 531219a012c9 - main - editors/imhex-current: 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: 531219a012c9b3064fa0c19ad622f1ff6ac9e7b6 Auto-Submitted: auto-generated The branch main has been updated by nobutaka: URL: https://cgit.FreeBSD.org/ports/commit/?id=531219a012c9b3064fa0c19ad622f1ff6ac9e7b6 commit 531219a012c9b3064fa0c19ad622f1ff6ac9e7b6 Author: MANTANI Nobutaka AuthorDate: 2024-04-21 05:07:51 +0000 Commit: MANTANI Nobutaka CommitDate: 2024-04-21 05:10:35 +0000 editors/imhex-current: Support {13,14}-stable after LLVM 18 import --- editors/imhex-current/Makefile | 15 +++++++++++---- .../patch-lib_third__party_jthread_includes_jthread.hpp | 9 ++++++--- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/editors/imhex-current/Makefile b/editors/imhex-current/Makefile index d4c251b1ab77..3d90a2bbb899 100644 --- a/editors/imhex-current/Makefile +++ b/editors/imhex-current/Makefile @@ -99,13 +99,17 @@ NLS_USES= gettext .include -.if (${OSVERSION} < 1302510) \ - || (${OSVERSION} >= 1400000 && ${OSVERSION} < 1400504) +# Before LLVM 17 import into the base system +.if (${OSVERSION} < 1302510 \ + || (${OSREL:R} == 14 && ${OSVERSION} < 1400504) \ + || (${OSREL:R} == 15 && ${OSVERSION} < 1500006)) IGNORE= requires libc++ of LLVM 17 on the base system .endif # After 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)) CXXFLAGS+= -fexperimental-library -D_LIBCPP_ENABLE_EXPERIMENTAL .endif @@ -126,7 +130,10 @@ post-extract: ${CP} -R ${WRKSRC_imhex_patterns}/* ${WRKDIR}/.build/_deps/imhex_patterns_src ${CP} -R ${WRKDIR}/imhex-bastion-pats-${GL_TAG_IMHEX_BASTION_PATS}/* ${WRKDIR}/.build/_deps/imhex_patterns_src/patterns/bastion ${CP} -R ${WRKDIR}/imhex-ffx-pats-${GL_TAG_IMHEX_FFX_PATS}/* ${WRKDIR}/.build/_deps/imhex_patterns_src/patterns/ffx -.if (${OSVERSION} < 1500018) +# Before LLVM 18 import into the base system +.if ((${OSREL:R} == 15 && ${OSVERSION} < 1500018) \ + || (${OSREL:R} == 14 && ${OSVERSION} < 1400511) \ + || (${OSREL:R} == 13 && ${OSVERSION} < 1303503)) ${CP} -R ${WRKSRC_jthread}/* ${WRKSRC}/lib/third_party/jthread .endif diff --git a/editors/imhex-current/files/patch-lib_third__party_jthread_includes_jthread.hpp b/editors/imhex-current/files/patch-lib_third__party_jthread_includes_jthread.hpp index dfda843ed3ad..1e7f19883e24 100644 --- a/editors/imhex-current/files/patch-lib_third__party_jthread_includes_jthread.hpp +++ b/editors/imhex-current/files/patch-lib_third__party_jthread_includes_jthread.hpp @@ -1,12 +1,15 @@ ---- lib/third_party/jthread/includes/jthread.hpp.orig 2024-04-13 11:34:49 UTC +--- lib/third_party/jthread/includes/jthread.hpp.orig 2024-03-23 09:15:12 UTC +++ lib/third_party/jthread/includes/jthread.hpp -@@ -1,6 +1,8 @@ +@@ -1,6 +1,11 @@ #pragma once -#if __cpp_lib_jthread >= 201911L +#include + -+#if __cpp_lib_jthread >= 201911L || __FreeBSD_version >= 1500018 ++#if __cpp_lib_jthread >= 201911L \ ++ || (__FreeBSD_version >= 1500000 && __FreeBSD_version >= 1500018) \ ++ || (__FreeBSD_version >= 1400000 && __FreeBSD_version >= 1400511) \ ++ || (__FreeBSD_version >= 1300000 && __FreeBSD_version >= 1303503) #include #else #include "../jthread/source/jthread.hpp"