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.

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

pcre2 fork fix for tvos and watchos #12183

Merged
merged 7 commits into from
Aug 22, 2022
Merged

pcre2 fork fix for tvos and watchos #12183

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
494757f
pcre2 fork fix for tvos and watchos
paulocoutinhox Aug 12, 2022
02d23d5
pcre2 fork fix for tvos and watchos
paulocoutinhox Aug 12, 2022
b51011a
Update tools
uilianries Aug 16, 2022
2766b78
Merge pull request #4 from uilianries/pcre2-tvos-watchos
paulocoutinhox Aug 16, 2022
bee047a
Merge branch 'master' of github.com:paulocoutinhox/conan-center-index…
paulocoutinhox Aug 17, 2022
d1291ba
pcre2 fork fix for tvos and watchos
paulocoutinhox Aug 18, 2022
154702e
Update recipes/pcre2/all/conanfile.py
paulocoutinhox Aug 21, 2022
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
40 changes: 23 additions & 17 deletions recipes/pcre2/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
from conan.tools.microsoft import msvc_runtime_flag, is_msvc
from conans import CMake, tools
from conan.tools.files import get, rmdir, replace_in_file
from conan.tools.scm import Version
from conan import ConanFile
from conans.errors import ConanInvalidConfiguration
from conan.errors import ConanInvalidConfiguration
from conans import CMake
import functools
import os


required_conan_version = ">=1.45.0"
required_conan_version = ">=1.48.0"


class PCRE2Conan(ConanFile):
Expand All @@ -28,6 +30,7 @@ class PCRE2Conan(ConanFile):
"with_zlib": [True, False],
"with_bzip2": [True, False],
"support_jit": [True, False],
"grep_support_callout_fork": [True, False],
}
default_options = {
"shared": False,
Expand All @@ -39,6 +42,7 @@ class PCRE2Conan(ConanFile):
"with_zlib": True,
"with_bzip2": True,
"support_jit": False,
"grep_support_callout_fork": True,
}

exports_sources = "CMakeLists.txt"
Expand All @@ -64,6 +68,7 @@ def configure(self):
if not self.options.build_pcre2grep:
del self.options.with_zlib
del self.options.with_bzip2
del self.options.grep_support_callout_fork

def requirements(self):
if self.options.get_safe("with_zlib"):
Expand All @@ -72,32 +77,32 @@ def requirements(self):
self.requires("bzip2/1.0.8")

def validate(self):
if not self.options.build_pcre2_8 and not self.options.build_pcre2_16 and not self.options.build_pcre2_32:
if not self.info.options.build_pcre2_8 and not self.info.options.build_pcre2_16 and not self.info.options.build_pcre2_32:
raise ConanInvalidConfiguration("At least one of build_pcre2_8, build_pcre2_16 or build_pcre2_32 must be enabled")
if self.options.build_pcre2grep and not self.options.build_pcre2_8:
if self.info.options.build_pcre2grep and not self.info.options.build_pcre2_8:
raise ConanInvalidConfiguration("build_pcre2_8 must be enabled for the pcre2grep program")

def source(self):
tools.get(**self.conan_data["sources"][self.version],
get(self, **self.conan_data["sources"][self.version],
destination=self._source_subfolder, strip_root=True)

def _patch_sources(self):
cmakelists = os.path.join(self._source_subfolder, "CMakeLists.txt")
# Do not add ${PROJECT_SOURCE_DIR}/cmake because it contains a custom
# FindPackageHandleStandardArgs.cmake which can break conan generators
if tools.Version(self.version) < "10.34":
tools.replace_in_file(cmakelists, "SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)", "")
if Version(self.version) < "10.34":
replace_in_file(self, cmakelists, "SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)", "")
else:
tools.replace_in_file(cmakelists, "LIST(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)", "")
replace_in_file(self, cmakelists, "LIST(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)", "")
# Avoid CMP0006 error (macos bundle)
tools.replace_in_file(cmakelists,
replace_in_file(self, cmakelists,
"RUNTIME DESTINATION bin",
"RUNTIME DESTINATION bin BUNDLE DESTINATION bin")

@functools.lru_cache(1)
def _configure_cmake(self):
cmake = CMake(self)
if tools.Version(self.version) >= "10.38":
if Version(self.version) >= "10.38":
cmake.definitions["BUILD_STATIC_LIBS"] = not self.options.shared
cmake.definitions["PCRE2_BUILD_PCRE2GREP"] = self.options.build_pcre2grep
cmake.definitions["PCRE2_SUPPORT_LIBZ"] = self.options.get_safe("with_zlib", False)
Expand All @@ -110,7 +115,8 @@ def _configure_cmake(self):
cmake.definitions["PCRE2_BUILD_PCRE2_16"] = self.options.build_pcre2_16
cmake.definitions["PCRE2_BUILD_PCRE2_32"] = self.options.build_pcre2_32
cmake.definitions["PCRE2_SUPPORT_JIT"] = self.options.support_jit
if tools.Version(self.version) < "10.38":
cmake.definitions["PCRE2GREP_SUPPORT_CALLOUT_FORK"] = self.options.get_safe("grep_support_callout_fork", False)
if Version(self.version) < "10.38":
# relocatable shared libs on Macos
cmake.definitions["CMAKE_POLICY_DEFAULT_CMP0042"] = "NEW"
cmake.configure(build_folder=self._build_subfolder)
Expand All @@ -125,10 +131,10 @@ def package(self):
self.copy(pattern="LICENCE", dst="licenses", src=self._source_subfolder)
cmake = self._configure_cmake()
cmake.install()
tools.rmdir(os.path.join(self.package_folder, "cmake"))
tools.rmdir(os.path.join(self.package_folder, "man"))
tools.rmdir(os.path.join(self.package_folder, "share"))
tools.rmdir(os.path.join(self.package_folder, "lib", "pkgconfig"))
rmdir(self, os.path.join(self.package_folder, "cmake"))
rmdir(self, os.path.join(self.package_folder, "man"))
rmdir(self, os.path.join(self.package_folder, "share"))
rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig"))

def package_info(self):
self.cpp_info.set_property("cmake_file_name", "PCRE2")
Expand Down Expand Up @@ -189,7 +195,7 @@ def package_info(self):

def _lib_name(self, name):
libname = name
if tools.Version(self.version) >= "10.38" and is_msvc(self) and not self.options.shared:
if Version(self.version) >= "10.38" and is_msvc(self) and not self.options.shared:
libname += "-static"
if self.settings.os == "Windows":
if self.settings.build_type == "Debug":
Expand Down