mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-27 07:57:27 +00:00
Code Issues Projects Releases Wiki Activity

c-ares: Upgrade to 1.17.1 release

Browse Source 
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>
This commit is contained in:
Khem Raj
2021-06-16 10:08:24 -07:00
parent abbca30bd6
commit b65f290419
2 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch
+10 -17
View File
@@ -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> From: Changqing Li <changqing.li@windriver.com>
Date: Tue, 24 Jul 2018 13:33:33 +0800 Date: Tue, 24 Jul 2018 13:33:33 +0800
Subject: [PATCH] cmake: Install libcares.pc 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 update to 1.14.0, fix patch warning
Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Changqing Li <changqing.li@windriver.com>
--- ---
CMakeLists.txt | 28 +++++++++++++++++++++++----- CMakeLists.txt | 23 +++++++++++++++++------
1 file changed, 23 insertions(+), 5 deletions(-) 1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd123e1..3a5878d 100644 index 08c0247..0020d6b 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -214,22 +214,25 @@ ADD_DEFINITIONS(${SYSFLAGS}) @@ -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 # When checking for symbols, we need to make sure we set the proper
# headers, libraries, and definitions for the detection to work properly # 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) @@ -551,6 +554,15 @@ ENDIF()
# Write ares_config.h configuration file. This is used only for the build. # Record toplevel CMakeLists.txt path
CONFIGURE_FILE (ares_config.h.cmake ${PROJECT_BINARY_DIR}/ares_config.h) set(CARES_TOPLEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+# Pass required CFLAGS to pkg-config in case of static library +# Pass required CFLAGS to pkg-config in case of static library
+IF (CARES_STATIC) +IF (CARES_STATIC)
@@ -66,19 +67,11 @@ index fd123e1..3a5878d 100644
# TRANSFORM_MAKEFILE_INC # 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") INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" COMPONENT Devel DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
ENDIF () 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). # 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). # 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") SET (CARES_FOUND 1 CACHE INTERNAL "CARES LIBRARY FOUND")
--
2.17.1
meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb → meta-oe/recipes-support/c-ares/c-ares_1.17.1.bb
+2 -2
View File
@@ -5,14 +5,14 @@ SECTION = "libs"
LICENSE = "MIT" LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb997454c8d62aa6a47f07a8cd48b006" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb997454c8d62aa6a47f07a8cd48b006"
PV = "1.16.0+gitr${SRCPV}" PV = "1.17.1"
SRC_URI = "\ SRC_URI = "\
git://github.com/c-ares/c-ares.git \ git://github.com/c-ares/c-ares.git \
file://cmake-install-libcares.pc.patch \ file://cmake-install-libcares.pc.patch \
file://0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.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_?)+)" UPSTREAM_CHECK_GITTAGREGEX = "cares-(?P<pver>\d+_(\d_?)+)"