From b5178b092a820e328434490cad47c2ea8342f392 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 22 Feb 2023 19:12:54 +0100 Subject: [PATCH] package/xerces: drop patch Drop patch which is not needed since commit 62cab101356c97432da482e168adaf065de65c4f. This patch is actually raising a build failure since bump to version 3.2.4 in commit d2d8f146a9f0ed3b66c4dd470bb76efdbb630a75 and https://github.com/apache/xerces-c/commit/af1935b567c18c8b2de71d6ea97239be60876335: CMake Error at src/CMakeLists.txt:1271 (add_library): Target "xerces-c" links to target "CURL::libcurl" but the target was not found. Perhaps a find_package() call is missing for an IMPORTED target, or an ALIAS target is missing? Fixes: - http://autobuild.buildroot.org/results/c62856a5eeb34714f26235b2d6f8adc4ea612686 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-fix-static-linking-with-curl.patch | 39 ------------------- 1 file changed, 39 deletions(-) delete mode 100644 package/xerces/0001-fix-static-linking-with-curl.patch diff --git a/package/xerces/0001-fix-static-linking-with-curl.patch b/package/xerces/0001-fix-static-linking-with-curl.patch deleted file mode 100644 index db38de79fc..0000000000 --- a/package/xerces/0001-fix-static-linking-with-curl.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 26e3f1440bbc75c704fc93ff43a2abbfbe4c0203 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 11 Oct 2018 22:56:50 +0200 -Subject: [PATCH] fix static linking with curl - -When curl is statically built with openssl support, xerces needs to -link with openssl libraries so use pkg_check_modules to get any -needed dependencies - -Fixes: - - http://autobuild.buildroot.org/results/29ca90fff2c8e38f2edf7240eca3aa3fe7397c45 - -Signed-off-by: Fabrice Fontaine ---- - cmake/XercesNetAccessorSelection.cmake | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/cmake/XercesNetAccessorSelection.cmake b/cmake/XercesNetAccessorSelection.cmake -index 7a63f1f6b..e90fcf034 100644 ---- a/cmake/XercesNetAccessorSelection.cmake -+++ b/cmake/XercesNetAccessorSelection.cmake -@@ -31,7 +31,13 @@ if(network) - - # Requires select() which is UNIX only - if(UNIX) -- find_package(CURL) -+ find_package(PkgConfig) -+ if (PkgConfig_FOUND) -+ pkg_check_modules(CURL libcurl) -+ if (NOT CURL_FOUND) -+ find_package(CURL) -+ endif() -+ endif() - if(CURL_FOUND) - list(APPEND netaccessors curl) - endif() --- -2.17.1 -