[vlc-commits] Contribs: fix ssh2 .pc file with zlib
Jean-Baptiste Kempf
git at videolan.org
Tue Feb 24 10:18:22 CET 2015
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Feb 24 10:11:12 2015 +0100| [0d70f5f4b78248c04c2efbc744cc04e2d64b1ac6] | committer: Jean-Baptiste Kempf
Contribs: fix ssh2 .pc file with zlib
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0d70f5f4b78248c04c2efbc744cc04e2d64b1ac6
---
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)
More information about the vlc-commits
mailing list