summaryrefslogtreecommitdiff
path: root/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-14 19:40:46 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-14 19:40:46 +0100
commitcf53aff5d6feebf06953794b03b1793cda3e2f77 (patch)
tree7007ec3309cf29392ab978fb6f2519a86678c966 /package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake
parent093c542e059b733e0207ce072679c2267339b860 (diff)
parentbc561e500e22bc9d953fd9a80144f80295a4cbbd (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
update Xorg / Mesa Conflicts: TODO
Diffstat (limited to 'package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake')
-rw-r--r--package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake b/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake
index 9a140e652..e7fcdfd2d 100644
--- a/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake
+++ b/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake
@@ -1,5 +1,5 @@
---- libssh-0.5.3.orig/cmake/Modules/FindZLIB.cmake 2012-11-20 12:41:49.000000000 +0100
-+++ libssh-0.5.3/cmake/Modules/FindZLIB.cmake 2014-01-11 12:11:52.000000000 +0100
+--- libssh-0.6.3.orig/cmake/Modules/FindZLIB.cmake 2013-12-21 18:37:12.000000000 +0100
++++ libssh-0.6.3/cmake/Modules/FindZLIB.cmake 2014-03-14 09:07:03.296701809 +0100
@@ -61,11 +61,11 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI
NAMES
zlib.h
@@ -13,9 +13,9 @@
)
mark_as_advanced(ZLIB_INCLUDE_DIR)
-@@ -98,12 +98,12 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI
- zlib
+@@ -99,12 +99,12 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI
zlib1
+ zlibd
PATHS
+ ${ZLIB_ROOT_DIR}/lib
/usr/local/lib