mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
c-ares: Upgrade to 1.17.1 release
Forward port cmake-install-libcares.pc.patch, drop the need to install
pkgconfig files as its already being done by main Makefile
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Forward port cmake-install-libcares.pc.patch, drop the need to install
pkgconfig files as its already being done by main Makefile
Conflicts:
meta-oe/recipes-support/c-ares/c-ares_1.17.1.bb
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit b65f290419)
Signed-off-by: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com>
Signed-off-by: Akash Hadke <akash.hadke@kpit.com>
Signed-off-by: Armin Kuster <akuster808@gmail.vom>
This commit is contained in:
parent
87841f0c18
commit
de05a500b9
|
|
@ -1,4 +1,4 @@
|
|||
From 12414304245cce6ef0e8b9547949be5109845353 Mon Sep 17 00:00:00 2001
|
||||
From 2cc41bee63223cb398ea932aad6ecc94ff5b61dd Mon Sep 17 00:00:00 2001
|
||||
From: Changqing Li <changqing.li@windriver.com>
|
||||
Date: Tue, 24 Jul 2018 13:33:33 +0800
|
||||
Subject: [PATCH] cmake: Install libcares.pc
|
||||
|
|
@ -11,12 +11,13 @@ Signed-off-by: Alexey Firago <alexey_firago@mentor.com>
|
|||
update to 1.14.0, fix patch warning
|
||||
|
||||
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
||||
|
||||
---
|
||||
CMakeLists.txt | 28 +++++++++++++++++++++++-----
|
||||
1 file changed, 23 insertions(+), 5 deletions(-)
|
||||
CMakeLists.txt | 23 +++++++++++++++++------
|
||||
1 file changed, 17 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index fd123e1..3a5878d 100644
|
||||
index 08c0247..0020d6b 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -214,22 +214,25 @@ ADD_DEFINITIONS(${SYSFLAGS})
|
||||
|
|
@ -50,9 +51,9 @@ index fd123e1..3a5878d 100644
|
|||
|
||||
# When checking for symbols, we need to make sure we set the proper
|
||||
# headers, libraries, and definitions for the detection to work properly
|
||||
@@ -554,6 +557,15 @@ CONFIGURE_FILE (ares_build.h.cmake ${PROJECT_BINARY_DIR}/ares_build.h)
|
||||
# Write ares_config.h configuration file. This is used only for the build.
|
||||
CONFIGURE_FILE (ares_config.h.cmake ${PROJECT_BINARY_DIR}/ares_config.h)
|
||||
@@ -551,6 +554,15 @@ ENDIF()
|
||||
# Record toplevel CMakeLists.txt path
|
||||
set(CARES_TOPLEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
|
||||
+# Pass required CFLAGS to pkg-config in case of static library
|
||||
+IF (CARES_STATIC)
|
||||
|
|
@ -66,19 +67,11 @@ index fd123e1..3a5878d 100644
|
|||
|
||||
# TRANSFORM_MAKEFILE_INC
|
||||
#
|
||||
@@ -728,6 +740,12 @@ IF (CARES_INSTALL)
|
||||
@@ -624,7 +636,6 @@ IF (CARES_INSTALL)
|
||||
INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" COMPONENT Devel DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
|
||||
ENDIF ()
|
||||
|
||||
+# pkg-config file
|
||||
+IF (CARES_INSTALL)
|
||||
+ SET (PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
|
||||
+ INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" DESTINATION ${PKGCONFIG_INSTALL_DIR})
|
||||
+ENDIF ()
|
||||
+
|
||||
-
|
||||
# Legacy chain-building variables (provided for compatibility with old code).
|
||||
# Don't use these, external code should be updated to refer to the aliases directly (e.g., Cares::cares).
|
||||
SET (CARES_FOUND 1 CACHE INTERNAL "CARES LIBRARY FOUND")
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@ SECTION = "libs"
|
|||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb997454c8d62aa6a47f07a8cd48b006"
|
||||
|
||||
PV = "1.16.1+gitr${SRCPV}"
|
||||
PV = "1.17.1"
|
||||
|
||||
SRC_URI = "\
|
||||
git://github.com/c-ares/c-ares.git;branch=main;protocol=https \
|
||||
file://cmake-install-libcares.pc.patch \
|
||||
file://0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch \
|
||||
"
|
||||
SRCREV = "74a1426ba60e2cd7977e53a22ef839c87415066e"
|
||||
SRCREV = "39c73b503d9ef70a58ad1f4a4643f15b01407c66"
|
||||
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "cares-(?P<pver>\d+_(\d_?)+)"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user