vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <[email protected]> | Tue Feb 24 10:11:12 2015 +0100| [638512c1296df66e9dc60e272e135d770ed54f7d] | committer: Jean-Baptiste Kempf
Contribs: fix ssh2 .pc file with zlib (cherry picked from commit 0d70f5f4b78248c04c2efbc744cc04e2d64b1ac6) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=638512c1296df66e9dc60e272e135d770ed54f7d --- contrib/src/ssh2/configure-zlib.patch | 10 ++++++++++ contrib/src/ssh2/rules.mak | 1 + 2 files changed, 11 insertions(+) diff --git a/contrib/src/ssh2/configure-zlib.patch b/contrib/src/ssh2/configure-zlib.patch new file mode 100644 index 0000000..78d1fd7 --- /dev/null +++ b/contrib/src/ssh2/configure-zlib.patch @@ -0,0 +1,10 @@ +--- ssh2/configure.ac 2015-02-24 10:09:30.662277334 +0100 ++++ ssh2/configure.ac.new 2015-02-24 10:08:57.658394756 +0100 +@@ -133,6 +133,7 @@ + AC_MSG_NOTICE([Try --with-libz-prefix=PATH if you know you have it]) + else + AC_DEFINE(LIBSSH2_HAVE_ZLIB, 1, [Compile in zlib support]) ++ LIBS="$LIBS -lz" + fi + fi + diff --git a/contrib/src/ssh2/rules.mak b/contrib/src/ssh2/rules.mak index ff9be2b..1a05fe8 100644 --- a/contrib/src/ssh2/rules.mak +++ b/contrib/src/ssh2/rules.mak @@ -18,6 +18,7 @@ $(TARBALLS)/libssh2-$(LIBSSH2_VERSION).tar.gz: ssh2: libssh2-$(LIBSSH2_VERSION).tar.gz .sum-ssh2 $(UNPACK) $(APPLY) $(SRC)/ssh2/no-tests.patch + $(APPLY) $(SRC)/ssh2/configure-zlib.patch $(MOVE) DEPS_ssh2 = gcrypt $(DEPS_gcrypt) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
