Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] libcpprestsdk: fix building as a static library
@ 2018-02-06 16:59 Adam Duskett
  2018-02-08 21:24 ` Thomas Petazzoni
  0 siblings, 1 reply; 2+ messages in thread
From: Adam Duskett @ 2018-02-06 16:59 UTC (permalink / raw)
  To: buildroot

zlib must be put after OpenSSL when building as a static library or else
OpenSSL will be unable to find zlib specific functions.

Put the search for zlib below the search for OpenSSL to
ensure that zlib links after OpenSSL.

Fixes:
http://autobuild.buildroot.net/results/1df528254468a5ece2f6fe37b3401e68737beed1
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
 .../0004-fix-static-library-linking.patch          | 56 ++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 package/libcpprestsdk/0004-fix-static-library-linking.patch

diff --git a/package/libcpprestsdk/0004-fix-static-library-linking.patch b/package/libcpprestsdk/0004-fix-static-library-linking.patch
new file mode 100644
index 0000000000..e904bb96c1
--- /dev/null
+++ b/package/libcpprestsdk/0004-fix-static-library-linking.patch
@@ -0,0 +1,56 @@
+From cefe8da037e0c2bb97dc1cb4d7ff43e7123feabf Mon Sep 17 00:00:00 2001
+From: Adam Duskett <aduskett@gmail.com>
+Date: Tue, 6 Feb 2018 11:34:49 -0500
+Subject: [PATCH] fix static library linking
+
+zlib must be put after OpenSSL when building as a static library or else
+OpenSSL will be unable to find zlib specific functions.
+
+Put the search for zlib below the search for OpenSSL to
+ensure that zlib links after OpenSSL.
+
+Upstream status: submitted
+https://github.com/Microsoft/cpprestsdk/pull/688
+
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ Release/src/CMakeLists.txt | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/Release/src/CMakeLists.txt b/Release/src/CMakeLists.txt
+index 3f8a0f8..2a6d440 100644
+--- a/Release/src/CMakeLists.txt
++++ b/Release/src/CMakeLists.txt
+@@ -75,14 +75,6 @@ else()
+   message(FATAL_ERROR "Invalid implementation")
+ endif()
+ 
+-# Compression component
+-if(CPPREST_EXCLUDE_COMPRESSION)
+-  target_compile_definitions(cpprest PRIVATE -DCPPREST_EXCLUDE_COMPRESSION=1)
+-else()
+-  cpprest_find_zlib()
+-  target_link_libraries(cpprest PRIVATE cpprestsdk_zlib_internal)
+-endif()
+-
+ # PPLX component
+ if(CPPREST_PPLX_IMPL STREQUAL "apple")
+   find_library(COREFOUNDATION CoreFoundation "/")
+@@ -133,6 +125,14 @@ else()
+   message(FATAL_ERROR "Invalid implementation")
+ endif()
+ 
++# Compression component
++if(CPPREST_EXCLUDE_COMPRESSION)
++  target_compile_definitions(cpprest PRIVATE -DCPPREST_EXCLUDE_COMPRESSION=1)
++else()
++  cpprest_find_zlib()
++  target_link_libraries(cpprest PRIVATE cpprestsdk_zlib_internal)
++endif()
++
+ # fileio streams component
+ if(CPPREST_FILEIO_IMPL STREQUAL "win32")
+   target_sources(cpprest PRIVATE streams/fileio_win32.cpp)
+-- 
+2.14.3
+
-- 
2.14.3

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [Buildroot] [PATCH 1/1] libcpprestsdk: fix building as a static library
  2018-02-06 16:59 [Buildroot] [PATCH 1/1] libcpprestsdk: fix building as a static library Adam Duskett
@ 2018-02-08 21:24 ` Thomas Petazzoni
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni @ 2018-02-08 21:24 UTC (permalink / raw)
  To: buildroot

Hello,

On Tue,  6 Feb 2018 11:59:50 -0500, Adam Duskett wrote:
> zlib must be put after OpenSSL when building as a static library or else
> OpenSSL will be unable to find zlib specific functions.
> 
> Put the search for zlib below the search for OpenSSL to
> ensure that zlib links after OpenSSL.
> 
> Fixes:
> http://autobuild.buildroot.net/results/1df528254468a5ece2f6fe37b3401e68737beed1
> Signed-off-by: Adam Duskett <aduskett@gmail.com>
> ---
>  .../0004-fix-static-library-linking.patch          | 56 ++++++++++++++++++++++
>  1 file changed, 56 insertions(+)
>  create mode 100644 package/libcpprestsdk/0004-fix-static-library-linking.patch
> 
> diff --git a/package/libcpprestsdk/0004-fix-static-library-linking.patch b/package/libcpprestsdk/0004-fix-static-library-linking.patch
> new file mode 100644
> index 0000000000..e904bb96c1
> --- /dev/null
> +++ b/package/libcpprestsdk/0004-fix-static-library-linking.patch
> @@ -0,0 +1,56 @@
> +From cefe8da037e0c2bb97dc1cb4d7ff43e7123feabf Mon Sep 17 00:00:00 2001
> +From: Adam Duskett <aduskett@gmail.com>
> +Date: Tue, 6 Feb 2018 11:34:49 -0500
> +Subject: [PATCH] fix static library linking
> +
> +zlib must be put after OpenSSL when building as a static library or else
> +OpenSSL will be unable to find zlib specific functions.
> +
> +Put the search for zlib below the search for OpenSSL to
> +ensure that zlib links after OpenSSL.
> +
> +Upstream status: submitted
> +https://github.com/Microsoft/cpprestsdk/pull/688
> +
> +Signed-off-by: Adam Duskett <aduskett@gmail.com>

This is in fact not really the correct fix. The correct fix is to use
pkg-config, which already takes care of recursive dependencies when
linking statically.

cpprestsdk shouldn't have to know that openssl internally uses zlib. In
fact, it is just an accident that cpprestsdk also needs zlib for other
reasons. It could very well be that cpprestsdk only needed openssl, and
had no reason to know about zlib.

Can we use pkg-config instead ? CMake has good support for pkg-config,
so it is quite easy to use.

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-02-08 21:24 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-06 16:59 [Buildroot] [PATCH 1/1] libcpprestsdk: fix building as a static library Adam Duskett
2018-02-08 21:24 ` Thomas Petazzoni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox