c-ares: remove custom patches
PATCH v2 1/1 c-ares: remove custom patches
Current patch is breaking the library dependencies added by cmake especially when you are static linking.
Applications need the ws2_32 library to be linked for mingw32 and with the existing patch this is not getting passed to the users.
Current patch seems to address this issue:
https://github.com/c-ares/c-ares/issues/373
Both issues are resolved in 1.17.2:
1.17.2-r0/git $ find . | grep c-ares-config.cmake.in ./c-ares-config.cmake.in
1.17.2-r0/git $ find . | grep libcares.pc.cmake ./libcares.pc.cmake
Signed-off-by Sinan Kaya <[email protected]>
--- ...ror-mv-libcares.pc.cmakein-to-libcar.patch | 27 ------- .../c-ares/cmake-install-libcares.pc.patch | 77 ------------------- .../recipes-support/c-ares/c-ares_1.17.2.bb | 5 +- 3 files changed, 1 insertion(+), 108 deletions(-) delete mode 100644 meta-oe/recipes-support/c-ares/c-ares/0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch delete mode 100644 meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch
meta-oe/recipes-support/c-ares/c-ares/0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch deleted +0 -27
@@ -1,27 +0,0 @@ -From f2f1e134bf5d9d0789942848e03006af8d926cf8 Mon Sep 17 00:00:00 2001 -From: Wang Mingyu <[email protected]> -Date: Tue, 17 Mar 2020 12:53:35 +0800 -Subject: [PATCH] fix configure error : mv libcares.pc.cmakein to - libcares.pc.cmake - -Signed-off-by: Wang Mingyu <[email protected]> ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3a5878d..c2e5740 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -563,7 +563,7 @@ IF (CARES_STATIC) - ENDIF() - - # 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.cmake ${PROJECT_BINARY_DIR}/libcares.pc @ONLY) - - - --- -2.17.1 -
meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch deleted +0 -77
77 lines not on this page · raw message
meta-oe/recipes-support/c-ares/c-ares_1.17.2.bb +1 -4
@@ -5,10 +5,7 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb997454c8d62aa6a47f07a8cd48b006" -SRC_URI = "git://github.com/c-ares/c-ares.git;branch=main \ - file://cmake-install-libcares.pc.patch \ - file://0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch \ - " +SRC_URI = "git://github.com/c-ares/c-ares.git;branch=main" SRCREV = "6654436a307a5a686b008c1d4c93b0085da6e6d8" UPSTREAM_CHECK_GITTAGREGEX = "cares-(?P<pver>\d+_(\d_?)+)"
Signature · 1 line
2.17.1