diff mbox series

[1/1] package/gerbera: fix static build with openssl

Message ID 20190402171156.25871-1-fontaine.fabrice@gmail.com
State Accepted
Commit 38730bfdf6101c1a9e8d4eef8331e12aca145ea0
Headers show
Series [1/1] package/gerbera: fix static build with openssl | expand

Commit Message

Fabrice Fontaine April 2, 2019, 5:11 p.m. UTC 
Fixes:
 - http://autobuild.buildroot.org/results/10098c8972725d54b717ddc8ea41f4de5e5b066d

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...make-FindLibUpnp.cmake-fix-static-linking.patch | 44 ++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 package/gerbera/0003-cmake-FindLibUpnp.cmake-fix-static-linking.patch

Comments

Peter Korsgaard April 3, 2019, 6:33 a.m. UTC | #1 
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Fixes:
 >  - http://autobuild.buildroot.org/results/10098c8972725d54b717ddc8ea41f4de5e5b066d

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed, thanks.
Peter Korsgaard April 5, 2019, 3:41 p.m. UTC | #2 
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Fixes:
 >  - http://autobuild.buildroot.org/results/10098c8972725d54b717ddc8ea41f4de5e5b066d

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2019.02.x, thanks.
diff mbox series

Patch

diff --git a/package/gerbera/0003-cmake-FindLibUpnp.cmake-fix-static-linking.patch b/package/gerbera/0003-cmake-FindLibUpnp.cmake-fix-static-linking.patch
new file mode 100644
index 0000000000..510bf2837f
--- /dev/null
+++ b/package/gerbera/0003-cmake-FindLibUpnp.cmake-fix-static-linking.patch
@@ -0,0 +1,44 @@ 
+From e2f8e6c30e43c1818a6677d17de87f53c9414405 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Tue, 2 Apr 2019 10:44:06 +0200
+Subject: [PATCH] cmake/FindLibUpnp.cmake: fix static linking
+
+Fix static linking with an openssl enabled upnp:
+ - remove libupnp-1.8 from pkg_check_modules call otherwise test will
+   fail if libupnp-1.8.pc is not found
+ - add PC_UPNP_LIBRARIES to UPNP_LIBRARIES
+
+Fixes:
+ - http://autobuild.buildroot.org/results/10098c8972725d54b717ddc8ea41f4de5e5b066d
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://github.com/gerbera/gerbera/pull/443]
+---
+ cmake/FindLibUpnp.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/FindLibUpnp.cmake b/cmake/FindLibUpnp.cmake
+index ec198d4d..5d2b032d 100644
+--- a/cmake/FindLibUpnp.cmake
++++ b/cmake/FindLibUpnp.cmake
+@@ -8,7 +8,7 @@
+ #  UPNP_HAS_REUSEADDR - If LinUPnP was built with SO_REUSEADDR support
+ 
+ find_package(PkgConfig QUIET)
+-pkg_check_modules (PC_UPNP QUIET libupnp-1.8 libupnp)
++pkg_search_module (PC_UPNP QUIET libupnp-1.8 libupnp)
+ 
+ find_path(UPNP_INCLUDE_DIR upnp.h
+     HINTS ${PC_UPNP_INCLUDEDIR} ${PC_UPNP_INCLUDE_DIRS}
+@@ -41,7 +41,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(UPnP
+     VERSION_VAR UPNP_VERSION_STRING)
+ 
+ if (UPNP_FOUND)
+-    set (UPNP_LIBRARIES ${UPNP_UPNP_LIBRARY} ${UPNP_IXML_LIBRARY})
++    set (UPNP_LIBRARIES ${UPNP_UPNP_LIBRARY} ${UPNP_IXML_LIBRARY} ${PC_UPNP_LIBRARIES})
+     set (UPNP_INCLUDE_DIRS ${UPNP_INCLUDE_DIR} )
+ endif ()
+ 
+-- 
+2.14.1
+