Date: Sun, 21 Apr 2024 05:11:09 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: 3e096293a981 - main - editors/imhex: Support {13,14}-stable after LLVM 18 import
Message-ID: <202404210511.43L5B9Ex012342@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=3e096293a981a783839ff8778f1fe64f818a5b31 commit 3e096293a981a783839ff8778f1fe64f818a5b31 Author: MANTANI Nobutaka <nobutaka@FreeBSD.org> AuthorDate: 2024-04-21 05:08:51 +0000 Commit: MANTANI Nobutaka <nobutaka@FreeBSD.org> 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 <bsd.port.pre.mk> # 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404210511.43L5B9Ex012342>