diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-12 13:01:44 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-12 13:01:44 +0100 |
| commit | 7bd70b733a54b6d1d26fd0f570328c95cc4858ef (patch) | |
| tree | 6af6cd410241c6bfb050c020fe685cd1e8c00f67 /package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake | |
| parent | 535d9124e1f78b15e0ecb32818bd4583cbab1d50 (diff) | |
| parent | 501363db19756c4f82a67b822a00e8444d3962cf (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake')
| -rw-r--r-- | package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake b/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake new file mode 100644 index 000000000..9a140e652 --- /dev/null +++ b/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake @@ -0,0 +1,29 @@ +--- 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 +@@ -61,11 +61,11 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI + NAMES + zlib.h + PATHS ++ ${ZLIB_ROOT_DIR}/include + /usr/local/include + /opt/local/include + /sw/include + /usr/lib/sfw/include +- ${ZLIB_ROOT_DIR}/include + ) + mark_as_advanced(ZLIB_INCLUDE_DIR) + +@@ -98,12 +98,12 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI + zlib + zlib1 + PATHS ++ ${ZLIB_ROOT_DIR}/lib + /usr/local/lib + /opt/local/lib + /sw/lib + /usr/sfw/lib/64 + /usr/sfw/lib +- ${ZLIB_ROOT_DIR}/lib + ) + mark_as_advanced(ZLIB_LIBRARY) + |