libcpprestsdk: fix building as a static library
PATCH v3 1/1 libcpprestsdk: fix building as a static library
Use pkg-config to find OpenSSL. This will automatically find any dependent libraries and put them in the correct order for linking.
Upstream status: submitted
https://github.com/Microsoft/cpprestsdk/pull/688
---
Changes v1 -> v2:
- Now using pkg-config instead of manually moving library search order (Thomas)
Changes v2 -> v3:
- Removed spurious and unrelated change in patch. (Thomas)
...prestsdk-fix-building-as-a-static-library.patch | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/libcpprestsdk/0004-libcpprestsdk-fix-building-as-a-static-library.patch
package/libcpprestsdk/0004-libcpprestsdk-fix-building-as-a-static-library.patch new file +38 -0
@@ -0,0 +1,38 @@ +From 8a9c3db14a390c0a8788405e52e9b8737a430191 Mon Sep 17 00:00:00 2001 +From: Adam Duskett <[email protected]> +Date: Mon, 12 Feb 2018 07:49:34 -0500 +Subject: [PATCH] libcpprestsdk: fix building as a static library + +Use pkg-config to find OpenSSL. This will automatically find any +dependent libraries and put them in the correct order for linking. + +Upstream status: submitted +https://github.com/Microsoft/cpprestsdk/pull/688 + +Signed-off-by: Adam Duskett <[email protected]> +--- + Release/cmake/cpprest_find_openssl.cmake | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/Release/cmake/cpprest_find_openssl.cmake b/Release/cmake/cpprest_find_openssl.cmake +index 0b49a7e..2be8afb 100644 +--- a/Release/cmake/cpprest_find_openssl.cmake ++++ b/Release/cmake/cpprest_find_openssl.cmake +@@ -41,8 +41,12 @@ function(cpprest_find_openssl) + # This should prevent linking against the system provided 0.9.8y + set(_OPENSSL_VERSION "") + endif() +- find_package(OpenSSL 1.0.0 REQUIRED) +- ++ if(UNIX) ++ find_package(PkgConfig REQUIRED) ++ pkg_search_module(OPENSSL openssl REQUIRED) ++ else() ++ find_package(OpenSSL 1.0.0 REQUIRED) ++ endif() + INCLUDE(CheckCXXSourceCompiles) + set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}") + set(CMAKE_REQUIRED_LIBRARIES "${OPENSSL_LIBRARIES}") +-- +2.14.3 +
Signature · 1 line
2.14.3
PATCH v3 1/1 libcpprestsdk: fix building as a static library
Hi,
Looks good overall, just a small nit...
Quoted 47 lines · Adam Duskett
Use pkg-config to find OpenSSL. This will automatically find any dependent libraries and put them in the correct order for linking.
Upstream status: submitted
https://github.com/Microsoft/cpprestsdk/pull/688Signed-off-by Adam Duskett <[email protected]>---
Changes v1 -> v2:
- Now using pkg-config instead of manually moving library search order (Thomas)Changes v2 -> v3:
- Removed spurious and unrelated change in patch. (Thomas)...prestsdk-fix-building-as-a-static-library.patch | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/libcpprestsdk/0004-libcpprestsdk-fix-building-as-a-static-library.patchpackage/libcpprestsdk/0004-libcpprestsdk-fix-building-as-a-static-library.patch new file +22
-0@@ -0,0 +1,38 @@ +From 8a9c3db14a390c0a8788405e52e9b8737a430191 Mon Sep 17 00:00:00 2001 +From: Adam Duskett <[email protected]> +Date: Mon, 12 Feb 2018 07:49:34 -0500 +Subject: [PATCH] libcpprestsdk: fix building as a static library + +Use pkg-config to find OpenSSL. This will automatically find any +dependent libraries and put them in the correct order for linking. + +Upstream status: submitted +https://github.com/Microsoft/cpprestsdk/pull/688 + +Signed-off-by: Adam Duskett <[email protected]> +--- + Release/cmake/cpprest_find_openssl.cmake | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/Release/cmake/cpprest_find_openssl.cmake b/Release/cmake/cpprest_find_openssl.cmake +index 0b49a7e..2be8afb 100644 +--- a/Release/cmake/cpprest_find_openssl.cmake ++++ b/Release/cmake/cpprest_find_openssl.cmake +@@ -41,8 +41,12 @@ function(cpprest_find_openssl) + # This should prevent linking against the system provided 0.9.8y
package/libcpprestsdk/0004-libcpprestsdk-fix-building-as-a-static-library.patch line 32
Quoted 10 lines
package/libcpprestsdk/0004-libcpprestsdk-fix-building-as-a-static-library.patch new file +10
-0+ set(_OPENSSL_VERSION "") + endif() +- find_package(OpenSSL 1.0.0 REQUIRED) +- ++ if(UNIX) ++ find_package(PkgConfig REQUIRED) ++ pkg_search_module(OPENSSL openssl REQUIRED) ++ else() ++ find_package(OpenSSL 1.0.0 REQUIRED) ++ endif()
These added lines have a mix of spaces and tabs for indentation. It would be nicer to use only tabs or only spaces, but I guess this is not an important enough reason to avoid merging the patch :-)
Quoted 8 lines
package/libcpprestsdk/0004-libcpprestsdk-fix-building-as-a-static-library.patch new file +6
-0+ INCLUDE(CheckCXXSourceCompiles) + set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}") + set(CMAKE_REQUIRED_LIBRARIES "${OPENSSL_LIBRARIES}") +-- +2.14.3 +Signature · 1 line
2.14.3
--
Adri?n ?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20180212/e65d5e17/attachment.asc>
PATCH v3 1/1 libcpprestsdk: fix building as a static library
In reply to Adam DuskettHello,
Quoted 11 lines · Adam Duskett
Use pkg-config to find OpenSSL. This will automatically find any dependent libraries and put them in the correct order for linking.
Upstream status: submitted
https://github.com/Microsoft/cpprestsdk/pull/688Signed-off-by Adam Duskett <[email protected]>---
Changes v1 -> v2:
- Now using pkg-config instead of manually moving library search order (Thomas)
Your commit log was missing a reference to the autobuilder failure being fixed, so I've added one and applied to master.
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH v3 1/1 libcpprestsdk: fix building as a static library
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Hello,
Quoted 6 lines · Adam Duskett
Use pkg-config to find OpenSSL. This will automatically find any dependent libraries and put them in the correct order for linking.
Upstream status: submitted
https://github.com/Microsoft/cpprestsdk/pull/688
Quoted 8 lines
Quoted 5 lines
Signed-off-by Adam Duskett <[email protected]>---
Changes v1 -> v2:
- Now using pkg-config instead of manually moving library search order (Thomas)Your commit log was missing a reference to the autobuilder failure being fixed, so I've added one and applied to master.
As it now uses pkg-config, libcpprestsdk should add host-pkgconf to _DEPENDENCIES.
Care to send a patch?
Signature · 1 line
Bye, Peter Korsgaard
PATCH v3 1/1 libcpprestsdk: fix building as a static library
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Korsgaard <[email protected]> writes:
Hi,
Quoted 7 lines
Quoted 2 lines
Your commit log was missing a reference to the autobuilder failure being fixed, so I've added one and applied to master.
As it now uses pkg-config, libcpprestsdk should add host-pkgconf to
_DEPENDENCIES.Care to send a patch?
I've now fixed it in git.
Signature · 1 line
Bye, Peter Korsgaard