| 1 |
radhermit 11/06/30 21:02:40 |
| 2 |
|
| 3 |
Added: libgit2-0.13.0-system-zlib.patch |
| 4 |
Log: |
| 5 |
Initial import. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-libs/libgit2/files/libgit2-0.13.0-system-zlib.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgit2/files/libgit2-0.13.0-system-zlib.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgit2/files/libgit2-0.13.0-system-zlib.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: libgit2-0.13.0-system-zlib.patch |
| 16 |
=================================================================== |
| 17 |
--- libgit2-0.13.0/CMakeLists.txt.orig |
| 18 |
+++ libgit2-0.13.0/CMakeLists.txt |
| 19 |
@@ -22,7 +22,14 @@ |
| 20 |
SET(LIBGIT2_VERSION_STRING "${LIBGIT2_VERSION_MAJOR}.${LIBGIT2_VERSION_MINOR}.${LIBGIT2_VERSION_REV}") |
| 21 |
|
| 22 |
# Find required dependencies |
| 23 |
-INCLUDE_DIRECTORIES(deps/zlib src include) |
| 24 |
+INCLUDE_DIRECTORIES(src include) |
| 25 |
+IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux") |
| 26 |
+ find_package(ZLIB REQUIRED) |
| 27 |
+ INCLUDE_DIRECTORIES( ${ZLIB_INCLUDE_DIRS} ) |
| 28 |
+ELSE (${CMAKE_SYSTEM_NAME} MATCHES "Linux") |
| 29 |
+ INCLUDE_DIRECTORIES(deps/zlib) |
| 30 |
+ FILE(GLOB SRC_ZLIB deps/zlib/*.c) |
| 31 |
+ENDIF() |
| 32 |
|
| 33 |
# Installation paths |
| 34 |
SET(INSTALL_BIN bin CACHE PATH "Where to install binaries to.") |
| 35 |
@@ -57,7 +64,6 @@ |
| 36 |
|
| 37 |
# Collect sourcefiles |
| 38 |
FILE(GLOB SRC src/*.c src/backends/*.c) |
| 39 |
-FILE(GLOB SRC_ZLIB deps/zlib/*.c) |
| 40 |
FILE(GLOB SRC_SHA1 src/block-sha1/*.c) |
| 41 |
FILE(GLOB SRC_PLAT src/unix/*.c) |
| 42 |
FILE(GLOB SRC_H include/git2/*.h) |
| 43 |
@@ -70,7 +76,7 @@ |
| 44 |
|
| 45 |
# Compile and link libgit2 |
| 46 |
ADD_LIBRARY(git2 ${SRC} ${SRC_PLAT} ${SRC_SHA1} ${SRC_ZLIB}) |
| 47 |
-TARGET_LINK_LIBRARIES(git2 ${CMAKE_THREAD_LIBS_INIT}) |
| 48 |
+TARGET_LINK_LIBRARIES(git2 ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES}) |
| 49 |
SET_TARGET_PROPERTIES(git2 PROPERTIES VERSION ${LIBGIT2_VERSION_STRING}) |
| 50 |
SET_TARGET_PROPERTIES(git2 PROPERTIES SOVERSION ${LIBGIT2_VERSION_MAJOR}) |
| 51 |
|
| 52 |
@@ -92,7 +98,7 @@ |
| 53 |
FILE(GLOB SRC_TEST tests/t??-*.c) |
| 54 |
|
| 55 |
ADD_EXECUTABLE(libgit2_test tests/test_main.c tests/test_lib.c tests/test_helpers.c ${SRC} ${SRC_PLAT} ${SRC_SHA1} ${SRC_TEST} ${SRC_ZLIB}) |
| 56 |
- TARGET_LINK_LIBRARIES(libgit2_test ${CMAKE_THREAD_LIBS_INIT}) |
| 57 |
+ TARGET_LINK_LIBRARIES(libgit2_test ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES}) |
| 58 |
|
| 59 |
ENABLE_TESTING() |
| 60 |
ADD_TEST(libgit2_test libgit2_test) |
Archives