From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Mon, 18 Jan 2021 21:33:00 +0000 (+0100)
Subject: package/xerces: renumber patch
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=635c59ef725688b7e719939c83daa5126a2c0131;p=buildroot.git

package/xerces: renumber patch

Commit 7f115d2de4276972098b8f4cfeb0150c8e851d89 forgot to renumber the
remaining patch

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---

diff --git a/package/xerces/0001-fix-static-linking-with-curl.patch b/package/xerces/0001-fix-static-linking-with-curl.patch
new file mode 100644
index 0000000000..db38de79fc
--- /dev/null
+++ b/package/xerces/0001-fix-static-linking-with-curl.patch
@@ -0,0 +1,39 @@
+From 26e3f1440bbc75c704fc93ff43a2abbfbe4c0203 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+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 <fontaine.fabrice@gmail.com>
+---
+ 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
+
diff --git a/package/xerces/0002-fix-static-linking-with-curl.patch b/package/xerces/0002-fix-static-linking-with-curl.patch
deleted file mode 100644
index db38de79fc..0000000000
--- a/package/xerces/0002-fix-static-linking-with-curl.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 26e3f1440bbc75c704fc93ff43a2abbfbe4c0203 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-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 <fontaine.fabrice@gmail.com>
----
- 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
-