vlc | branch: master | Konstantin Pavlov <[email protected]> | Sun Feb 11 15:01:40 2018 +0300| [bc0163f31c82092fd6f08323772fa71ada8fc21a] | committer: Konstantin Pavlov
contrib: libdsm: don't hardcode -liconv. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bc0163f31c82092fd6f08323772fa71ada8fc21a --- .../0001-pkg-config-don-t-hardcode-liconv.patch | 23 ++++++++++++++++++++++ contrib/src/libdsm/rules.mak | 1 + 2 files changed, 24 insertions(+) diff --git a/contrib/src/libdsm/0001-pkg-config-don-t-hardcode-liconv.patch b/contrib/src/libdsm/0001-pkg-config-don-t-hardcode-liconv.patch new file mode 100644 index 0000000000..5cc76e033b --- /dev/null +++ b/contrib/src/libdsm/0001-pkg-config-don-t-hardcode-liconv.patch @@ -0,0 +1,23 @@ +From 284587e66a58f70fc1875306ccd077643c6c076d Mon Sep 17 00:00:00 2001 +From: Konstantin Pavlov <[email protected]> +Date: Sun, 11 Feb 2018 14:56:38 +0300 +Subject: [PATCH] pkg-config: don't hardcode -liconv. + +It's not available everywhere. +--- + libdsm.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libdsm.pc.in b/libdsm.pc.in +index df022d5..cc9b22a 100644 +--- a/libdsm.pc.in ++++ b/libdsm.pc.in +@@ -8,4 +8,4 @@ Description: Minimalist and read-only smb client library + Version: @BDSM_PACKAGE_VERSION@ + Cflags: -I${includedir} @PTHREAD_CFLAGS@ + Libs: -L${libdir} -ldsm +-Libs.private: -liconv -ltasn1 @PTHREAD_LIBS@ @BDSM_LIB_LOG@ @SOCKET_LIBS@ ++Libs.private: @LIBICONV@ -ltasn1 @PTHREAD_LIBS@ @BDSM_LIB_LOG@ @SOCKET_LIBS@ +-- +2.14.3 (Apple Git-98) + diff --git a/contrib/src/libdsm/rules.mak b/contrib/src/libdsm/rules.mak index 8c7469ca52..3390b94a86 100644 --- a/contrib/src/libdsm/rules.mak +++ b/contrib/src/libdsm/rules.mak @@ -21,6 +21,7 @@ endif libdsm: libdsm-$(LIBDSM_VERSION).tar.gz .sum-libdsm $(UNPACK) + $(APPLY) $(SRC)/libdsm/0001-pkg-config-don-t-hardcode-liconv.patch $(MOVE) DEPS_libdsm = libtasn1 iconv _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
