Merge pull request #89495 from akien-mga/pcre2-fix-sljit-compilation-…

…ioscross pcre2: Remove unused sjlit files after last update
godotengine · Mar 15, 2024 · 9c2db0c · 9c2db0c
2 parents 7d4804e + 739fcd1
commit 9c2db0c
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 1,127 deletions.
diff --git a/modules/regex/SCsub b/modules/regex/SCsub
@@ -29,7 +29,7 @@ if env["builtin_pcre2"]:
         "pcre2_extuni.c",
         "pcre2_find_bracket.c",
         "pcre2_jit_compile.c",
-        # "pcre2_jit_match.c", "pcre2_jit_misc.c", # these files are included in pcre2_jit_compile.c.
+        # "pcre2_jit_match.c", "pcre2_jit_misc.c", # Included in `pcre2_jit_compile.c`.
         "pcre2_maketables.c",
         "pcre2_match.c",
         "pcre2_match_data.c",
@@ -44,6 +44,7 @@ if env["builtin_pcre2"]:
         "pcre2_substring.c",
         "pcre2_tables.c",
         "pcre2_ucd.c",
+        # "pcre2_ucptables.c", # Included in `pcre2_tables.c`.
         "pcre2_valid_utf.c",
         "pcre2_xclass.c",
     ]

diff --git a/thirdparty/README.md b/thirdparty/README.md
@@ -769,9 +769,6 @@ Files extracted from upstream source:
 - `src/sljit/`
 - `AUTHORS` and `LICENCE`
 
-A sljit patch from upstream was backported to fix macOS < 11.0 compilation
-in 10.40, it can be found in the `patches` folder.
-
 
 ## recastnavigation
 

diff --git a/thirdparty/pcre2/patches/sljit-macos11-conditional.patch b/thirdparty/pcre2/patches/sljit-macos11-conditional.patch