[DO-973] harfbuzz package (!10)
Co-authored-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.tech> Reviewed-on: https://git.avroid.tech/Conan/conan_build/pulls/10
This commit is contained in:
17
recipes/pcre2/all/patches/0001-fix-cmake-1.32.patch
Normal file
17
recipes/pcre2/all/patches/0001-fix-cmake-1.32.patch
Normal file
@@ -0,0 +1,17 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -83,13 +83,13 @@
|
||||
# 2018-06-19 PH added checks for stdint.h and inttypes.h
|
||||
# 2018-06-27 PH added Daniel's patch to increase the stack for MSVC
|
||||
|
||||
-PROJECT(PCRE2 C)
|
||||
|
||||
# Increased minimum to 2.8.0 to support newer add_test features. Set policy
|
||||
# CMP0026 to avoid warnings for the use of LOCATION in GET_TARGET_PROPERTY.
|
||||
|
||||
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0)
|
||||
CMAKE_POLICY(SET CMP0026 OLD)
|
||||
+PROJECT(PCRE2 C)
|
||||
|
||||
SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) # for FindReadline.cmake
|
||||
|
||||
14
recipes/pcre2/all/patches/0001-fix-cmake-1.33.patch
Normal file
14
recipes/pcre2/all/patches/0001-fix-cmake-1.33.patch
Normal file
@@ -0,0 +1,14 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -86,10 +86,10 @@
|
||||
# 2018-11-16 PH added PCRE2GREP_SUPPORT_CALLOUT_FORK support and tidied
|
||||
# 2019-02-16 PH hacked to avoid CMP0026 policy issue (see comments below)
|
||||
|
||||
-PROJECT(PCRE2 C)
|
||||
|
||||
# Increased minimum to 2.8.0 to support newer add_test features.
|
||||
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0)
|
||||
+PROJECT(PCRE2 C)
|
||||
|
||||
# Set policy CMP0026 to avoid warnings for the use of LOCATION in
|
||||
# GET_TARGET_PROPERTY. This should no longer be required.
|
||||
14
recipes/pcre2/all/patches/0001-fix-cmake-1.35.patch
Normal file
14
recipes/pcre2/all/patches/0001-fix-cmake-1.35.patch
Normal file
@@ -0,0 +1,14 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -93,10 +93,10 @@
|
||||
# 2020-04-25 Carlo added function check for mkostemp used in ProtExecAllocator
|
||||
# 2020-04-28 PH added function check for memfd_create based on Carlo's patch
|
||||
|
||||
-PROJECT(PCRE2 C)
|
||||
|
||||
# Increased minimum to 2.8.0 to support newer add_test features.
|
||||
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0)
|
||||
+PROJECT(PCRE2 C)
|
||||
|
||||
# Set policy CMP0026 to avoid warnings for the use of LOCATION in
|
||||
# GET_TARGET_PROPERTY. This should no longer be required.
|
||||
14
recipes/pcre2/all/patches/0001-fix-cmake-1.36.patch
Normal file
14
recipes/pcre2/all/patches/0001-fix-cmake-1.36.patch
Normal file
@@ -0,0 +1,14 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -95,10 +95,10 @@
|
||||
# 2020-05-25 PH added a check for Intel CET
|
||||
# 2020-12-03 PH altered the definition of pcre2test as suggested by Daniel
|
||||
|
||||
-PROJECT(PCRE2 C)
|
||||
|
||||
# Increased minimum to 2.8.5 to support GNUInstallDirs.
|
||||
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
|
||||
+PROJECT(PCRE2 C)
|
||||
|
||||
# Set policy CMP0026 to avoid warnings for the use of LOCATION in
|
||||
# GET_TARGET_PROPERTY. This should no longer be required.
|
||||
15
recipes/pcre2/all/patches/0001-fix-cmake-1.39.patch
Normal file
15
recipes/pcre2/all/patches/0001-fix-cmake-1.39.patch
Normal file
@@ -0,0 +1,15 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -100,11 +100,11 @@
|
||||
# 2021-08-28 PH increased minimum version
|
||||
# 2021-08-28 PH added test for realpath()
|
||||
|
||||
-PROJECT(PCRE2 C)
|
||||
|
||||
# Increased minimum to 2.8.5 to support GNUInstallDirs.
|
||||
# Increased minimum to 3.0.0 because older than 2.8.12 is deprecated.
|
||||
CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0)
|
||||
+PROJECT(PCRE2 C)
|
||||
|
||||
# Set policy CMP0026 to avoid warnings for the use of LOCATION in
|
||||
# GET_TARGET_PROPERTY. This should no longer be required.
|
||||
52
recipes/pcre2/all/patches/0002-fix-cmake-c-std.patch
Normal file
52
recipes/pcre2/all/patches/0002-fix-cmake-c-std.patch
Normal file
@@ -0,0 +1,52 @@
|
||||
From 12b0e40ee4556318e5a0da3155f28bdfd7c5bc35 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= <carenas@gmail.com>
|
||||
Date: Sun, 15 Jan 2023 14:38:44 -0800
|
||||
Subject: [PATCH] build: make the C99 requirement explicit
|
||||
|
||||
Recent code uses C99 syntax (as reported in #163, and therefore it
|
||||
will fail to build unless C99 (or higher) support is required by the
|
||||
compiler (gcc >= 5 does it by default).
|
||||
|
||||
For those unfortunate to need an older compiler that does require a
|
||||
flag to enable that, make sure that both autoconf and cmake make it
|
||||
explicit.
|
||||
|
||||
While testing the change with the ancient autoconf version listed as
|
||||
a prerequisite, noticed that the LT_INIT syntax introduced with 91485e5
|
||||
(Update configure.ac for latest version of autoconf., 2021-02-02), was
|
||||
not supported, so update the autoconf minimum as well.
|
||||
---
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index cec7dfb4..a8147575 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -107,1 +107,3 @@
|
||||
PROJECT(PCRE2 C)
|
||||
+set(CMAKE_C_STANDARD 99)
|
||||
+set(CMAKE_C_STANDARD_REQUIRED TRUE)
|
||||
|
||||
# Set policy CMP0026 to avoid warnings for the use of LOCATION in
|
||||
# GET_TARGET_PROPERTY. This should no longer be required.
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index ce5bda3c..67b2fdce 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -22,7 +22,7 @@ m4_define(libpcre2_posix_version, [3:4:0])
|
||||
# NOTE: The CMakeLists.txt file searches for the above variables in the first
|
||||
# 50 lines of this file. Please update that if the variables above are moved.
|
||||
|
||||
-AC_PREREQ([2.60])
|
||||
+AC_PREREQ([2.62])
|
||||
AC_INIT([PCRE2],pcre2_major.pcre2_minor[]pcre2_prerelease,[],[pcre2])
|
||||
AC_CONFIG_SRCDIR([src/pcre2.h.in])
|
||||
AM_INIT_AUTOMAKE([dist-bzip2 dist-zip])
|
||||
@@ -42,7 +42,7 @@ AC_CONFIG_MACRO_DIR([m4])
|
||||
|
||||
remember_set_CFLAGS="$CFLAGS"
|
||||
|
||||
-AC_PROG_CC
|
||||
+m4_version_prereq(2.70, [AC_PROG_CC], [AC_PROG_CC_C99])
|
||||
AM_PROG_CC_C_O
|
||||
AC_USE_SYSTEM_EXTENSIONS
|
||||
|
||||
Reference in New Issue
Block a user