NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/gerbera: fix static build with openssl

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

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine 2019-04-02 19:11:56 +02:00 committed by Peter Korsgaard
parent 58ea5f5835
commit 38730bfdf6
1 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
package/gerbera/0003-cmake-FindLibUpnp.cmake-fix-static-linking.patch Normal file
View File

@ -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