Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pcre2: Update to 10.43 #89371

Merged
merged 1 commit into from
Mar 11, 2024
Merged

pcre2: Update to 10.43 #89371

merged 1 commit into from
Mar 11, 2024

Conversation

Chubercik
Copy link
Contributor

Copy link
Member

@akien-mga akien-mga left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Could you squash the commits?

@akien-mga akien-mga modified the milestones: 4.x, 4.3 Mar 11, 2024
@akien-mga akien-mga merged commit a2edcf8 into godotengine:master Mar 11, 2024
16 checks passed
@akien-mga
Copy link
Member

Thanks!

@Chubercik Chubercik deleted the pcre2-10.43 branch March 11, 2024 13:27
@akien-mga
Copy link
Member

I'm running into a build issue for iOS (with osxcross) on our official buildsystem:

/root/ioscross/arm64//usr/bin/arm-apple-darwin11-clang -o thirdparty/pcre2/src/pcre2_pattern_info_32.ios.template_debug.arm64.o -c -std=gnu11 -miphoneos-version-min=12.0 -fobjc-arc -arch arm64 -fmessage-length=0 -fno-strict-aliasing -fdiagnostics-print-source-range-info -fdiagnostics-show-category=id -fdiagnostics-parseable-fixits -fpascal-strings -fblocks -fvisibility=hidden -MMD -MT dependencies -isysroot /root/ioscross/arm64/SDK/iPhoneOS17.2.sdk -Wno-ambiguous-macro -O2 -w -DDEBUG_ENABLED -DNDEBUG -DNO_EDITOR_SPLASH -DNEED_LONG_INT -DIOS_ENABLED -DUNIX_ENABLED -DCOREAUDIO_ENABLED -DVULKAN_ENABLED -DRD_ENABLED -DGLES3_ENABLED -DGLES_SILENCE_DEPRECATION -DMINIZIP_ENABLED -DBROTLI_ENABLED -DTHREADS_ENABLED -DCLIPPER2_ENABLED -DZSTD_STATIC_LINKING_ONLY -DVK_USE_PLATFORM_IOS_MVK -DGODOT_MODULE -DPCRE2_STATIC -DHAVE_CONFIG_H -DSUPPORT_UNICODE -DSUPPORT_JIT -DPCRE2_CODE_UNIT_WIDTH=32 -Ithirdparty/pcre2/src -Ithirdparty/libpng -Ithirdparty/vulkan -Ithirdparty/vulkan/include -Ithirdparty/zstd -Ithirdparty/zlib -Ithirdparty/clipper2/include -Ithirdparty/brotli/include -I/root/ioscross/arm64/SDK/iPhoneOS17.2.sdk/System/Library/Frameworks/OpenGLES.framework/Headers -Iplatform/ios -I/root/ioscross/arm64/SDK/iPhoneOS17.2.sdk/usr/include -I/root/ioscross/arm64/SDK/iPhoneOS17.2.sdk/System/Library/Frameworks/AudioUnit.framework/Headers -I. thirdparty/pcre2/src/pcre2_pattern_info.c
In file included from thirdparty/pcre2/src/pcre2_jit_compile.c:85:
In file included from thirdparty/pcre2/src/sljit/sljitLir.c:317:
thirdparty/pcre2/src/sljit/allocator_src/sljitExecAllocatorApple.c:123:2: error: call to undeclared function 'SLJIT_UPDATE_WX_FLAGS'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration,2]
        SLJIT_UPDATE_WX_FLAGS(retval, (uint8_t *)retval + size, 0);
        ^

@akien-mga
Copy link
Member

I have no clue what I'm doing, but this seems to work it around:

diff --git a/thirdparty/pcre2/src/sljit/allocator_src/sljitExecAllocatorApple.c b/thirdparty/pcre2/src/sljit/allocator_src/sljitExecAllocatorApple.c
index 95b9842fa9..3fc8091ead 100644
--- a/thirdparty/pcre2/src/sljit/allocator_src/sljitExecAllocatorApple.c
+++ b/thirdparty/pcre2/src/sljit/allocator_src/sljitExecAllocatorApple.c
@@ -104,6 +104,7 @@ static SLJIT_INLINE void apple_update_wx_flags(sljit_s32 enable_exec)
 #else
 #define SLJIT_MAP_JIT	(0)
 #endif
+#define SLJIT_UPDATE_WX_FLAGS(from, to, enable_exec)
 
 #endif /* TARGET_OS_OSX */
 

@akien-mga
Copy link
Member

I think we're also compiling too many files, src/sljit/sljitExecAllocator.c no longer exists upstream, it's replaced by this new allocator_src. But we compile both.

@Chubercik
Copy link
Contributor Author

I think we're also compiling too many files, src/sljit/sljitExecAllocator.c no longer exists upstream, it's replaced by this new allocator_src. But we compile both.

Yeah, that might be on me 😬

Whatever's going on with sljitExecAllocatorApple.c seems to be an issue upstream; the patch you propose looks good.

akien-mga added a commit to akien-mga/godot that referenced this pull request Mar 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants