Commit 810fab00 authored by David Fuhrmann's avatar David Fuhrmann Committed by Konstantin Pavlov

contrib: srt: Patch to add implicit link libraries to pkgconfig file

This library needs to add implicit link libraries like -lstdc++
to the private pkgconfig linking flags inside the pc file, to allow
linking with a non-C++ module (like we have in VLC).

(cherry picked from commit 0a57721d)
Signed-off-by: Konstantin Pavlov's avatarKonstantin Pavlov <thresh@videolan.org>
parent f2032bb5
--- srt.old/CMakeLists.txt 2017-12-09 09:10:02.000000000 +0100
+++ srt/CMakeLists.txt 2017-12-09 09:18:38.000000000 +0100
@@ -425,13 +425,15 @@
# This may cause trouble when you want to compile your app with static libstdc++;
# if your build requires it, you'd probably remove -lstdc++ from the list
# obtained by `pkg-config --libs`.
-#
-# Some sensible solution for that is desired. Currently turned on only on demand.
-if (ENABLE_C_DEPS)
-if ( LINUX )
- set (IFNEEDED_SRT_LDFLAGS "${IFNEEDED_SRT_LDFLAGS} -lstdc++ -lm")
-endif()
-endif()
+
+message("Adding the following implicit link libraries: ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES}")
+foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES})
+ if(IS_ABSOLUTE ${LIB} AND EXISTS ${LIB})
+ set(SRT_LIBS_PRIVATE ${SRT_LIBS_PRIVATE} ${LIB})
+ else()
+ set(SRT_LIBS_PRIVATE ${SRT_LIBS_PRIVATE} "-l${LIB}")
+ endif()
+endforeach()
join_arguments(SRT_LIBS_PRIVATE ${SRT_LIBS_PRIVATE})
......@@ -24,6 +24,7 @@ $(TARBALLS)/srt-$(SRT_VERSION).tar.gz:
srt: srt-$(SRT_VERSION).tar.gz .sum-srt
$(UNPACK)
$(APPLY) $(SRC)/srt/fix-pc.patch
$(APPLY) $(SRC)/srt/add-implicit-link-libraries.patch
$(call pkg_static,"scripts/haisrt.pc.in")
mv srt-$(SRT_VERSION) $@ && touch $@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment