From 89627d911ba7d6384d60bd5b6d07cb250401a44c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= Date: Mon, 2 Sep 2024 03:09:56 -0700 Subject: [PATCH] autotools: fix --enable-jit=auto Reflect the new location of sljit and update release files --- NON-AUTOTOOLS-BUILD | 2 +- README | 2 +- configure.ac | 2 +- src/config.h.generic | 3 ++- src/pcre2.h.generic | 1 + 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/NON-AUTOTOOLS-BUILD b/NON-AUTOTOOLS-BUILD index 851976ae2..d7becc974 100644 --- a/NON-AUTOTOOLS-BUILD +++ b/NON-AUTOTOOLS-BUILD @@ -138,7 +138,7 @@ example. Note that you must compile pcre2_jit_compile.c, even if you have not defined SUPPORT_JIT in src/config.h, because when JIT support is not configured, dummy functions are compiled. When JIT support IS configured, - pcre2_jit_compile.c #includes other files from the sljit subdirectory, + pcre2_jit_compile.c #includes other files from the sljit dependency, all of whose names begin with "sljit". It also #includes src/pcre2_jit_match.c and src/pcre2_jit_misc.c, so you should not compile those yourself. diff --git a/README b/README index 9b6a3f7d8..773c0e580 100644 --- a/README +++ b/README @@ -865,7 +865,7 @@ The distribution should contain the files listed below. src/pcre2_jit_simd_inc.h header used by JIT src/pcre2_ucp.h header for Unicode property handling - sljit/* source files for the JIT compiler + deps/sljit/sljit_src/* source files for the JIT compiler (B) Source files for programs that use PCRE2: diff --git a/configure.ac b/configure.ac index 74aa7de44..90854d682 100644 --- a/configure.ac +++ b/configure.ac @@ -219,7 +219,7 @@ if test "$enable_jit" = "auto"; then CPPFLAGS=-I$srcdir AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ #define SLJIT_CONFIG_AUTO 1 - #include "src/sljit/sljitConfigCPU.h" + #include "deps/sljit/sljit_src/sljitConfigCPU.h" #if (defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED) #error unsupported #endif]])], enable_jit=yes, enable_jit=no) diff --git a/src/config.h.generic b/src/config.h.generic index 089e1f5ff..ef938af67 100644 --- a/src/config.h.generic +++ b/src/config.h.generic @@ -154,7 +154,8 @@ sure both macros are undefined; an emulation function will then be used. */ /* Define to 1 if you have the header file. */ /* #undef HAVE_UNISTD_H */ -/* Define to 1 if the compiler supports simple visibility declarations. */ +/* Define to 1 if the compiler supports GCC compatible visibility + declarations. */ /* #undef HAVE_VISIBILITY */ /* Define to 1 if you have the header file. */ diff --git a/src/pcre2.h.generic b/src/pcre2.h.generic index ef5d9b7b0..80995fc0b 100644 --- a/src/pcre2.h.generic +++ b/src/pcre2.h.generic @@ -410,6 +410,7 @@ released, the numbers must not be changed. */ #define PCRE2_ERROR_INTERNAL_DUPMATCH (-65) #define PCRE2_ERROR_DFA_UINVALID_UTF (-66) #define PCRE2_ERROR_INVALIDOFFSET (-67) +#define PCRE2_ERROR_JIT_UNSUPPORTED (-68) /* Request types for pcre2_pattern_info() */