* [Buildroot] [PATCH v3 1/1] libcpprestsdk: fix building as a static library
@ 2018-02-12 17:23 Adam Duskett
2018-02-12 19:27 ` Adrian Perez de Castro
2018-02-13 22:14 ` Thomas Petazzoni
0 siblings, 2 replies; 5+ messages in thread
From: Adam Duskett @ 2018-02-12 17:23 UTC (permalink / raw)
To: buildroot
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 <aduskett@gmail.com>
---
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
diff --git a/package/libcpprestsdk/0004-libcpprestsdk-fix-building-as-a-static-library.patch b/package/libcpprestsdk/0004-libcpprestsdk-fix-building-as-a-static-library.patch
new file mode 100644
index 0000000000..de900178d5
--- /dev/null
+++ b/package/libcpprestsdk/0004-libcpprestsdk-fix-building-as-a-static-library.patch
@@ -0,0 +1,38 @@
+From 8a9c3db14a390c0a8788405e52e9b8737a430191 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <aduskett@gmail.com>
+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 <aduskett@gmail.com>
+---
+ 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
+
--
2.14.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Buildroot] [PATCH v3 1/1] libcpprestsdk: fix building as a static library
2018-02-12 17:23 [Buildroot] [PATCH v3 1/1] libcpprestsdk: fix building as a static library Adam Duskett
@ 2018-02-12 19:27 ` Adrian Perez de Castro
2018-02-13 22:14 ` Thomas Petazzoni
1 sibling, 0 replies; 5+ messages in thread
From: Adrian Perez de Castro @ 2018-02-12 19:27 UTC (permalink / raw)
To: buildroot
Hi,
Looks good overall, just a small nit...
On Mon, 12 Feb 2018 12:23:50 -0500, Adam Duskett <aduskett@gmail.com> wrote:
> 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 <aduskett@gmail.com>
> ---
> 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
>
> diff --git a/package/libcpprestsdk/0004-libcpprestsdk-fix-building-as-a-static-library.patch b/package/libcpprestsdk/0004-libcpprestsdk-fix-building-as-a-static-library.patch
> new file mode 100644
> index 0000000000..de900178d5
> --- /dev/null
> +++ b/package/libcpprestsdk/0004-libcpprestsdk-fix-building-as-a-static-library.patch
> @@ -0,0 +1,38 @@
> +From 8a9c3db14a390c0a8788405e52e9b8737a430191 Mon Sep 17 00:00:00 2001
> +From: Adam Duskett <aduskett@gmail.com>
> +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 <aduskett@gmail.com>
> +---
> + 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()
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 :-)
> + INCLUDE(CheckCXXSourceCompiles)
> + set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
> + set(CMAKE_REQUIRED_LIBRARIES "${OPENSSL_LIBRARIES}")
> +--
> +2.14.3
> +
> --
> 2.14.3
Reviewed-by: Adrian Perez de Castro <aperez@igalia.com>
--
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>
^ permalink raw reply [flat|nested] 5+ messages in thread* [Buildroot] [PATCH v3 1/1] libcpprestsdk: fix building as a static library
2018-02-12 17:23 [Buildroot] [PATCH v3 1/1] libcpprestsdk: fix building as a static library Adam Duskett
2018-02-12 19:27 ` Adrian Perez de Castro
@ 2018-02-13 22:14 ` Thomas Petazzoni
2018-02-15 10:10 ` Peter Korsgaard
1 sibling, 1 reply; 5+ messages in thread
From: Thomas Petazzoni @ 2018-02-13 22:14 UTC (permalink / raw)
To: buildroot
Hello,
On Mon, 12 Feb 2018 12:23:50 -0500, Adam Duskett wrote:
> 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 <aduskett@gmail.com>
> ---
> 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
--
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v3 1/1] libcpprestsdk: fix building as a static library
2018-02-13 22:14 ` Thomas Petazzoni
@ 2018-02-15 10:10 ` Peter Korsgaard
2018-02-15 21:38 ` Peter Korsgaard
0 siblings, 1 reply; 5+ messages in thread
From: Peter Korsgaard @ 2018-02-15 10:10 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:
> Hello,
> On Mon, 12 Feb 2018 12:23:50 -0500, Adam Duskett wrote:
>> 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 <aduskett@gmail.com>
>> ---
>> 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?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v3 1/1] libcpprestsdk: fix building as a static library
2018-02-15 10:10 ` Peter Korsgaard
@ 2018-02-15 21:38 ` Peter Korsgaard
0 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2018-02-15 21:38 UTC (permalink / raw)
To: buildroot
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:
Hi,
>> 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.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-02-15 21:38 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-12 17:23 [Buildroot] [PATCH v3 1/1] libcpprestsdk: fix building as a static library Adam Duskett
2018-02-12 19:27 ` Adrian Perez de Castro
2018-02-13 22:14 ` Thomas Petazzoni
2018-02-15 10:10 ` Peter Korsgaard
2018-02-15 21:38 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.