[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: vpl: fix C++ library listed in the .pc file

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
db48f404 by Steve Lhomme at 2025-01-13T07:50:46+00:00
contrib: vpl: fix C++ library listed in the .pc file

- - - - -
7b43acff by Steve Lhomme at 2025-01-13T07:50:46+00:00
contrib: modplug: reference libc++ for all Clang compilations

Not just the Apple ones.

- - - - -


3 changed files:

- contrib/src/modplug/rules.mak
- + contrib/src/vpl/0001-CMake-depend-on-libc-when-compiling-with-Clang.patch
- contrib/src/vpl/rules.mak


Changes:

=====================================
contrib/src/modplug/rules.mak
=====================================
@@ -21,7 +21,7 @@ libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz .sum-modplug
 	$(APPLY) $(SRC)/modplug/modplug-win32-static.patch
 	$(APPLY) $(SRC)/modplug/macosx-do-not-force-min-version.patch
 	$(APPLY) $(SRC)/modplug/fix-endianness-check.diff
-ifdef HAVE_MACOSX
+ifdef HAVE_CLANG
 	$(APPLY) $(SRC)/modplug/mac-use-c-stdlib.patch
 endif
 	$(call pkg_static,"libmodplug.pc.in")


=====================================
contrib/src/vpl/0001-CMake-depend-on-libc-when-compiling-with-Clang.patch
=====================================
@@ -0,0 +1,28 @@
+From bb93515761bc6c4a48ff5a9361bc84c36101c3d2 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4 at ycbcr.xyz>
+Date: Fri, 10 Jan 2025 08:10:21 +0100
+Subject: [PATCH] CMake: depend on libc++ when compiling with Clang
+
+libstdc++ is a GCC thing.
+---
+ libvpl/CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/libvpl/CMakeLists.txt b/libvpl/CMakeLists.txt
+index 46503e1..fadd1cc 100644
+--- a/libvpl/CMakeLists.txt
++++ b/libvpl/CMakeLists.txt
+@@ -190,7 +190,9 @@ if(INSTALL_DEV)
+     # WIN32 in general
+     set(MINGW_LIBS "-lole32 -lgdi32 -luuid")
+   endif()
+-  if(NOT MSVC)
++  if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
++    set(CXX_LIB "-lc++")
++  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+     set(CXX_LIB "-lstdc++")
+   endif()
+   set(VPL_PKGCONFIG_DEPENDENT_LIBS
+-- 
+2.43.0
+


=====================================
contrib/src/vpl/rules.mak
=====================================
@@ -36,6 +36,7 @@ $(TARBALLS)/libvpl-$(VPL_VERSION).tar.gz:
 
 vpl: libvpl-$(VPL_VERSION).tar.gz .sum-vpl
 	$(UNPACK)
+	$(APPLY) $(SRC)/vpl/0001-CMake-depend-on-libc-when-compiling-with-Clang.patch
 	$(MOVE)
 
 .vpl: vpl toolchain.cmake



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/e768ca3fa665f5585ad3b2465cab3391424c7d4b...7b43acff4f2c342d51a604ae29e34c078e5d188e

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/e768ca3fa665f5585ad3b2465cab3391424c7d4b...7b43acff4f2c342d51a604ae29e34c078e5d188e
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance