Date: Sun, 21 Apr 2024 05:11:08 GMT
From: MANTANI Nobutaka <nobutaka@FreeBSD.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject: git: 531219a012c9 - main - editors/imhex-current: Support {13,14}-stable after LLVM 18 import
Message-ID: <202404210511.43L5B8sn012294@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by nobutaka: URL: https://cgit.FreeBSD.org/ports/commit/?id=531219a012c9b3064fa0c19ad622f1ff6ac9e7b6 commit 531219a012c9b3064fa0c19ad622f1ff6ac9e7b6 Author: MANTANI Nobutaka <nobutaka@FreeBSD.org> AuthorDate: 2024-04-21 05:07:51 +0000 Commit: MANTANI Nobutaka <nobutaka@FreeBSD.org> 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 <bsd.port.pre.mk> -.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 <osreldate.h> + -+#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 <thread> #else #include "../jthread/source/jthread.hpp"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404210511.43L5B8sn012294>