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

c-ares: upgrade 1.13.0 -> 1.14.0

Browse Source 
License-Update: copyright year updated

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Changqing Li
2018-07-25 11:27:23 +08:00
committed by Khem Raj
parent e07b4b0203
commit 7b20dd0f25
2 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch
+22 -15
View File
@@ -1,23 +1,27 @@
From 7e1ae687916fd5878ee755afbdea6b10494e0b92 Mon Sep 17 00:00:00 2001 From 12414304245cce6ef0e8b9547949be5109845353 Mon Sep 17 00:00:00 2001
From: Alexey Firago <alexey_firago@mentor.com> From: Changqing Li <changqing.li@windriver.com>
Date: Wed, 26 Jul 2017 23:21:25 +0300 Date: Tue, 24 Jul 2018 13:33:33 +0800
Subject: [PATCH] cmake: Install libcares.pc Subject: [PATCH] cmake: Install libcares.pc
Prepare and install libcares.pc file during cmake build, so libraries Prepare and install libcares.pc file during cmake build, so libraries
using pkg-config to find libcares will not fail. using pkg-config to find libcares will not fail.
Signed-off-by: Alexey Firago <alexey_firago@mentor.com> 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 | 21 +++++++++++++++++++++ CMakeLists.txt | 23 +++++++++++++++++++++++
libcares.pc.cmakein | 20 ++++++++++++++++++++ libcares.pc.cmakein | 20 ++++++++++++++++++++
2 files changed, 41 insertions(+) 2 files changed, 43 insertions(+)
create mode 100644 libcares.pc.cmakein create mode 100644 libcares.pc.cmakein
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 364b6c7..0016b67 100644 index 60a880c..71eaa53 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -173,21 +173,29 @@ ADD_DEFINITIONS(${SYSFLAGS}) @@ -193,22 +193,30 @@ ADD_DEFINITIONS(${SYSFLAGS})
# Tell C-Ares about libraries to depend on # Tell C-Ares about libraries to depend on
@@ -43,32 +47,35 @@ index 364b6c7..0016b67 100644
LIST (APPEND CARES_DEPENDENT_LIBS ws2_32) LIST (APPEND CARES_DEPENDENT_LIBS ws2_32)
+ LIST (APPEND CARES_PRIVATE_LIBS_LIST "-lws2_32") + LIST (APPEND CARES_PRIVATE_LIBS_LIST "-lws2_32")
ENDIF () ENDIF ()
+string (REPLACE ";" " " CARES_PRIVATE_LIBS "${CARES_PRIVATE_LIBS_LIST}") +string (REPLACE ";" " " CARES_PRIVATE_LIBS "${CARES_PRIVATE_LIBS_LIST}")
# 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
@@ -489,6 +497,13 @@ CONFIGURE_FILE (ares_build.h.cmake ${PROJECT_BINARY_DIR}/ares_build.h) # headers, libraries, and definitions for the detection to work properly
@@ -514,6 +522,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. # 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) CONFIGURE_FILE (ares_config.h.cmake ${PROJECT_BINARY_DIR}/ares_config.h)
+# 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)
+ SET (CPPFLAG_CARES_STATICLIB "-DCARES_STATICLIB") + SET (CPPFLAG_CARES_STATICLIB "-DCARES_STATICLIB")
+ENDIF() +ENDIF()
+ +
+# Write ares_config.h configuration file. This is used only for the build. +# Write ares_config.h configuration file. This is used only for the build.
+CONFIGURE_FILE (libcares.pc.cmakein ${PROJECT_BINARY_DIR}/libcares.pc @ONLY) +CONFIGURE_FILE (libcares.pc.cmakein ${PROJECT_BINARY_DIR}/libcares.pc @ONLY)
+
+
# TRANSFORM_MAKEFILE_INC # TRANSFORM_MAKEFILE_INC
# #
@@ -625,6 +640,12 @@ IF (CARES_INSTALL) @@ -664,6 +681,12 @@ IF (CARES_INSTALL)
INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake" DESTINATION ${CMAKECONFIG_INSTALL_DIR}) INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
ENDIF () ENDIF ()
+# pkg-config file +# pkg-config file
+IF (CARES_INSTALL) +IF (CARES_INSTALL)
+ SET (PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + SET (PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" DESTINATION ${PKGCONFIG_INSTALL_DIR}) + INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" DESTINATION ${PKGCONFIG_INSTALL_DIR})
+ENDIF () +ENDIF ()
+ +
# Legacy chain-building variables (provided for compatibility with old code). # Legacy chain-building variables (provided for compatibility with old code).
@@ -76,7 +83,7 @@ index 364b6c7..0016b67 100644
SET (CARES_FOUND 1 CACHE INTERNAL "CARES LIBRARY FOUND") SET (CARES_FOUND 1 CACHE INTERNAL "CARES LIBRARY FOUND")
diff --git a/libcares.pc.cmakein b/libcares.pc.cmakein diff --git a/libcares.pc.cmakein b/libcares.pc.cmakein
new file mode 100644 new file mode 100644
index 0000000..f29fede index 0000000..3579256
--- /dev/null --- /dev/null
+++ b/libcares.pc.cmakein +++ b/libcares.pc.cmakein
@@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@
meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb → meta-networking/recipes-support/c-ares/c-ares_1.14.0.bb
+3 -3
View File
@@ -3,15 +3,15 @@ SUMMARY = "c-ares is a C library that resolves names asynchronously."
HOMEPAGE = "http://daniel.haxx.se/projects/c-ares/" HOMEPAGE = "http://daniel.haxx.se/projects/c-ares/"
SECTION = "libs" SECTION = "libs"
LICENSE = "MIT" LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=f4b026880834eb01c035c5e5cb47ccac" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb997454c8d62aa6a47f07a8cd48b006"
PV = "1.13.0+gitr${SRCPV}" PV = "1.14.0+gitr${SRCPV}"
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 \
" "
SRCREV = "3be1924221e1326df520f8498d704a5c4c8d0cce" SRCREV = "17dc1b3102e0dfc3e7e31369989013154ee17893"
UPSTREAM_CHECK_GITTAGREGEX = "cares-(?P<pver>\d+_(\d_?)+)" UPSTREAM_CHECK_GITTAGREGEX = "cares-(?P<pver>\d+_(\d_?)+)"