Skip to content

[pcre] download instead of bundle and bump from PCRE_8.43 to PCRE2_10.47 #21857

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.

Sign up for GitHub

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

Closed
ferdymercury wants to merge 11 commits into from
Closed

[pcre] download instead of bundle and bump from PCRE_8.43 to PCRE2_10.47 #21857

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
83d2d22
[builtins] download instead of bundle PCRE and bump from PCRE_8.43 to…
ferdymercury Apr 9, 2026
982c9d6
Update CMakeLists.txt
ferdymercury Apr 12, 2026
77c99a2
[cmake] encapsulate dependency behind CMake target
ferdymercury Apr 16, 2026
e628209
[pcre] simplify builtin dependency and use canonical structure
ferdymercury Apr 16, 2026
c805a88
[cmake] fix pcre2 prefix
ferdymercury Apr 16, 2026
80a3bd4
[cmake] precreate include dir
ferdymercury Apr 16, 2026
ff8c5f4
fix paths
ferdymercury Apr 16, 2026
6a3ec72
fix libpath
ferdymercury Apr 16, 2026
0b3fb28
specify install step and fix winpath
ferdymercury Apr 16, 2026
7c2da4d
specify install step and fix winpath
ferdymercury Apr 16, 2026
008a678
fix syntax
ferdymercury Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/root-ci-config/buildconfig/alma10-clang_ninja.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ builtin_gif=ON
builtin_jpeg=ON
builtin_lz4=ON
builtin_lzma=ON
builtin_pcre=ON
builtin_png=ON
builtin_vdt=ON
builtin_zlib=ON
Expand Down
74 changes: 42 additions & 32 deletions builtins/pcre/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,49 +4,60 @@
# For the licensing terms see $ROOTSYS/LICENSE.
# For the list of contributors see $ROOTSYS/README/CREDITS.

# **PLEASE UPDATE ALSO THE FOLLOWING LINE WHEN UPDATING THE VERSION**
# 21 Oct 2025, https://github.com/PCRE2Project/pcre2/releases/tag/pcre2-10.47
set(ROOT_PCRE2_VERSION 10.47)
set(ROOT_PCRE2_HASH "47fe8c99461250d42f89e6e8fdaeba9da057855d06eb7fc08d9ca03fd08d7bc7")

include(ExternalProject)

# Clear cache variables set by find_package(PCRE)
# Clear cache variables set by find_package(PCRE) and/or find_package(PCRE2)
# to ensure that we use the builtin version
foreach(var PCRE_FOUND PCRE_VERSION PCRE_INCLUDE_DIR PCRE_PCRE_LIBRARY PCRE_LIBRARIES)
foreach(var PCRE_FOUND PCRE_VERSION PCRE_INCLUDE_DIR PCRE_PCRE_LIBRARY PCRE_LIBRARIES PCRE2_FOUND PCRE2_VERSION PCRE2_INCLUDE_DIR PCRE2_PCRE2_LIBRARY PCRE2_LIBRARIES)
unset(${var})
unset(${var} CACHE)
endforeach()

if(WIN32)
if(CMAKE_GENERATOR MATCHES Ninja)
if (CMAKE_BUILD_TYPE MATCHES Debug)
set(PCRE_POSTFIX d)
set(PCRE2_POSTFIX d)
endif()
else()
if(winrtdebug)
set(PCRE_POSTFIX $<$<CONFIG:Debug>:d>)
set(pcre_config_kind "Debug")
set(PCRE2_POSTFIX $<$<CONFIG:Debug>:d>)
set(pcre2_config_kind "Debug")
else()
set(pcre_config_kind "Release")
set(pcre2_config_kind "Release")
endif()
set(pcre_config "--config ${pcre_config_kind}")
set(pcre2_config "--config ${pcre2_config_kind}")
endif()
endif()

set(PCRE_VERSION "8.43" CACHE INTERNAL "" FORCE)
set(PCRE_LIBNAME ${CMAKE_STATIC_LIBRARY_PREFIX}pcre${PCRE_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
set(PCRE2_VERSION ${ROOT_PCRE2_VERSION} CACHE INTERNAL "" FORCE)
if(MSVC)
set(PCRE2_LIBNAME ${CMAKE_STATIC_LIBRARY_PREFIX}pcre2-8-static${PCRE2_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
else()
set(PCRE2_LIBNAME ${CMAKE_STATIC_LIBRARY_PREFIX}pcre2-8${PCRE2_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
endif()

# build byproducts only needed by Ninja
if("${CMAKE_GENERATOR}" STREQUAL "Ninja")
set(PCRE_BYPRODUCTS
<BINARY_DIR>/pcre.h
<BINARY_DIR>/${PCRE_LIBNAME}
set(PCRE2_BYPRODUCTS
<BINARY_DIR>/interface/pcre2.h
<BINARY_DIR>/${PCRE2_LIBNAME}
)
endif()

ExternalProject_Add(PCRE
URL ${CMAKE_CURRENT_SOURCE_DIR}/pcre-${PCRE_VERSION}.tar.bz2
URL_HASH SHA256=f1026a7f455b8ba726d6fff94d5f989e55ad55f7b4eb946938803ac2aa41743c
ExternalProject_Add(BUILTIN_PCRE
URL ${lcgpackages}/pcre2-${PCRE2_VERSION}.tar.bz2
URL_HASH SHA256=${ROOT_PCRE2_HASH}

LOG_DOWNLOAD TRUE
LOG_CONFIGURE TRUE
LOG_BUILD TRUE
LOG_INSTALL TRUE
LOG_OUTPUT_ON_FAILURE TRUE

CMAKE_CACHE_ARGS
-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
Expand All @@ -56,35 +67,34 @@ ExternalProject_Add(PCRE
-DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
-DCMAKE_BUILD_SHARED_LIBS:BOOL=FALSE
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=TRUE
-DCMAKE_POLICY_VERSION_MINIMUM:STRING=3.5
-DPCRE_BUILD_TESTS:BOOL=FALSE
-DPCRE2_BUILD_TESTS:BOOL=FALSE

BUILD_COMMAND
${CMAKE_COMMAND} --build <BINARY_DIR> ${pcre_config} --target pcre
${CMAKE_COMMAND} --build <BINARY_DIR> ${pcre2_config} --target pcre2-8-static

BUILD_BYPRODUCTS
${PCRE_BYPRODUCTS}
${PCRE2_BYPRODUCTS}

INSTALL_COMMAND ""
TIMEOUT 600
)

ExternalProject_Get_Property(PCRE BINARY_DIR)
ExternalProject_Get_Property(BUILTIN_PCRE BINARY_DIR)

set(PCRE_FOUND TRUE CACHE INTERNAL "" FORCE)
set(PCRE_INCLUDE_DIR "${BINARY_DIR}" CACHE INTERNAL "" FORCE)
set(PCRE2_FOUND TRUE CACHE INTERNAL "" FORCE)
set(PCRE2_INCLUDE_DIR "${BINARY_DIR}/interface" CACHE INTERNAL "" FORCE)
if(WIN32)
set(PCRE_PCRE_LIBRARY "${BINARY_DIR}/${pcre_config_kind}/${PCRE_LIBNAME}" CACHE INTERNAL "" FORCE)
set(PCRE2_PCRE2_LIBRARY "${BINARY_DIR}/${pcre2_config_kind}/${PCRE2_LIBNAME}" CACHE INTERNAL "" FORCE)
else()
set(PCRE_PCRE_LIBRARY "${BINARY_DIR}/${CMAKE_CFG_INTDIR}/${PCRE_LIBNAME}" CACHE INTERNAL "" FORCE)
set(PCRE2_PCRE2_LIBRARY "${BINARY_DIR}/${CMAKE_CFG_INTDIR}/${PCRE2_LIBNAME}" CACHE INTERNAL "" FORCE)
endif()
set(PCRE_LIBRARIES "${PCRE_PCRE_LIBRARY}" CACHE INTERNAL "" FORCE)
set(PCRE_TARGET PCRE)
set(PCRE2_LIBRARIES "${PCRE2_PCRE2_LIBRARY}" CACHE INTERNAL "" FORCE)
set(PCRE2_TARGET PCRE2)
Comment thread
ferdymercury marked this conversation as resolved.
Outdated

add_library(pcre_builtin INTERFACE)
target_include_directories(pcre_builtin INTERFACE $<BUILD_INTERFACE:${PCRE_INCLUDE_DIR}>)
target_link_libraries(pcre_builtin INTERFACE $<BUILD_INTERFACE:${PCRE_LIBRARIES}>)
add_library(PCRE::PCRE ALIAS pcre_builtin)
add_dependencies(pcre_builtin PCRE)
add_library(pcre2_builtin INTERFACE)
target_include_directories(pcre2_builtin INTERFACE $<BUILD_INTERFACE:${PCRE2_INCLUDE_DIR}>)
target_link_libraries(pcre2_builtin INTERFACE $<BUILD_INTERFACE:${PCRE2_LIBRARIES}>)
add_library(PCRE2::PCRE2 ALIAS pcre2_builtin)
add_dependencies(pcre2_builtin PCRE2)
Comment thread
ferdymercury marked this conversation as resolved.
Outdated

set_property(GLOBAL APPEND PROPERTY ROOT_BUILTIN_TARGETS PCRE)
set_property(GLOBAL APPEND PROPERTY ROOT_BUILTIN_TARGETS BUILTIN_PCRE)
Binary file removed builtins/pcre/pcre-8.43.tar.bz2
View file
Open in desktop
Binary file not shown.
14 changes: 5 additions & 9 deletions cmake/modules/SearchInstalledSoftware.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ ROOT_FIND_REQUIRED_DEP(LZ4 builtin_lz4)
ROOT_FIND_REQUIRED_DEP(LibLZMA builtin_lzma)
ROOT_FIND_REQUIRED_DEP(ZLIB builtin_zlib)
ROOT_FIND_REQUIRED_DEP(ZSTD builtin_zstd)
# ROOT_FIND_REQUIRED_DEP(PCRE2 builtin_pcre) More complex due to multiple versions, dealt below
Comment thread
ferdymercury marked this conversation as resolved.
Outdated

if(NOT "${MISSING_PACKAGES}" STREQUAL "")
message(FATAL_ERROR "The following packages need to be installed or enabled to build ROOT: ${MISSING_PACKAGES}")
Expand Down Expand Up @@ -287,21 +288,16 @@ if(NOT builtin_pcre)
endforeach()
find_package(PCRE2)
if(NOT PCRE2_FOUND)
if(fail-on-missing)
find_package(PCRE REQUIRED)
else()
find_package(PCRE)
if(NOT PCRE_FOUND)
message(STATUS "PCRE not found. Switching on builtin_pcre option")
set(builtin_pcre ON CACHE BOOL "Enabled because PCRE not found (${builtin_pcre_description})" FORCE)
endif()
find_package(PCRE)
if(NOT PCRE_FOUND)
message(SEND_ERROR "PCRE2 required but not found. Install it on the system (preferred), or explicitly request the builtin version.")
endif()
endif()
endif()

if(builtin_pcre)
list(APPEND ROOT_BUILTINS PCRE)
add_subdirectory(builtins/pcre)
list(APPEND ROOT_BUILTINS BUILTIN_PCRE)
endif()

#---Check for LZMA-------------------------------------------------------------------
Expand Down
3 changes: 3 additions & 0 deletions core/base/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,9 @@ if(PCRE2_FOUND)
else()
target_link_libraries(Core PRIVATE PCRE::PCRE)
endif()
if(builtin_xxhash)
add_dependencies(Core BUILTIN_PCRE)
endif()
Comment thread
ferdymercury marked this conversation as resolved.
Outdated
Comment thread
ferdymercury marked this conversation as resolved.
Outdated

ROOT_INSTALL_HEADERS(${BASE_HEADER_DIRS})

Expand Down
Loading