[vlc-commits] contrib: modplug: Link against libc++ on macOS

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Wed May 13 19:42:15 2020 +0200| [a7dd702b66d6f3c211988e26a8534aba01c581de] | committer: David Fuhrmann

contrib: modplug: Link against libc++ on macOS

libstdc++ is not available anymore in modern sdks.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a7dd702b66d6f3c211988e26a8534aba01c581de
---

 contrib/src/modplug/mac-use-c-stdlib.patch | 9 +++++++++
 contrib/src/modplug/rules.mak              | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/contrib/src/modplug/mac-use-c-stdlib.patch b/contrib/src/modplug/mac-use-c-stdlib.patch
new file mode 100644
index 0000000000..c6a283a287
--- /dev/null
+++ b/contrib/src/modplug/mac-use-c-stdlib.patch
@@ -0,0 +1,9 @@
+--- libmodplug-0.8.9.0/libmodplug.pc.in.old	2020-04-29 21:39:14.000000000 +0200
++++ libmodplug-0.8.9.0/libmodplug.pc.in	2020-04-29 21:40:06.000000000 +0200
+@@ -8,5 +8,5 @@
+ Version: @VERSION@
+ Requires: 
+ Libs: -L${libdir} -lmodplug 
+-Libs.private: -lstdc++ -lm
++Libs.private: -lc++ -lm
+ Cflags: -I${includedir} -DMODPLUG_STATIC
diff --git a/contrib/src/modplug/rules.mak b/contrib/src/modplug/rules.mak
index 6776bfbbe6..aa10fc41bb 100644
--- a/contrib/src/modplug/rules.mak
+++ b/contrib/src/modplug/rules.mak
@@ -18,6 +18,9 @@ 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
+	$(APPLY) $(SRC)/modplug/mac-use-c-stdlib.patch
+endif
 	$(call pkg_static,"libmodplug.pc.in")
 	$(MOVE)