0001-CMakeLists.txt-prefer-pkg_check_modules.patch 1.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940
  1. From 565c003ac412c9b0fa39d208d4a911f4300477c3 Mon Sep 17 00:00:00 2001
  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  3. Date: Sun, 26 Feb 2023 20:39:11 +0100
  4. Subject: [PATCH] CMakeLists.txt: prefer pkg_check_modules
  5. Prefer pkg_check_modules over find_package to avoid the following static
  6. build failure with openssl and -latomic:
  7. /home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-8/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libssl.a(ssl_cert.o): in function `ssl_cert_free':
  8. ssl_cert.c:(.text+0x53c): undefined reference to `__atomic_fetch_sub_4'
  9. Fixes:
  10. - http://autobuild.buildroot.org/results/f606bb15bf4f88ba29ef0795413e13acc9cd0976
  11. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  12. [Upstream status: https://github.com/zhaojh329/ssl/pull/4]
  13. ---
  14. CMakeLists.txt | 4 ++--
  15. 1 file changed, 2 insertions(+), 2 deletions(-)
  16. diff --git a/src/ssl/CMakeLists.txt b/src/ssl/CMakeLists.txt
  17. index 4868bf7..36488c7 100644
  18. --- a/src/ssl/CMakeLists.txt
  19. +++ b/src/ssl/CMakeLists.txt
  20. @@ -14,10 +14,10 @@ endif()
  21. find_package(PkgConfig QUIET)
  22. -find_package(OpenSSL)
  23. +pkg_check_modules(OPENSSL openssl)
  24. if (NOT OPENSSL_FOUND)
  25. - pkg_check_modules(OPENSSL openssl)
  26. + find_package(OpenSSL)
  27. endif()
  28. find_package(WolfSSL)
  29. --
  30. 2.39.1