diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2011-06-30 22:06:33 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2011-06-30 22:06:33 +0000 |
| commit | e31cc30c7668028523e44990630e8f7ed1b86f75 (patch) | |
| tree | 1b62b277ac0e924f81c8d17e8458f880426544ad /dev-libs | |
| parent | [sys-infiniband/openib] Initial import to tree (diff) | |
| download | gentoo-2-e31cc30c7668028523e44990630e8f7ed1b86f75.tar.gz gentoo-2-e31cc30c7668028523e44990630e8f7ed1b86f75.tar.bz2 gentoo-2-e31cc30c7668028523e44990630e8f7ed1b86f75.zip | |
Use system zlib on all non-Windows systems if available.
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/libgit2/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/libgit2/files/libgit2-0.13.0-system-zlib.patch | 34 |
2 files changed, 15 insertions, 25 deletions
diff --git a/dev-libs/libgit2/ChangeLog b/dev-libs/libgit2/ChangeLog index 2888918f29fd..03b3c558a95d 100644 --- a/dev-libs/libgit2/ChangeLog +++ b/dev-libs/libgit2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/libgit2 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgit2/ChangeLog,v 1.1 2011/06/30 21:02:39 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgit2/ChangeLog,v 1.2 2011/06/30 22:06:33 radhermit Exp $ + + 30 Jun 2011; Tim Harder <radhermit@gentoo.org> + files/libgit2-0.13.0-system-zlib.patch: + Use system zlib on all non-Windows systems if available. *libgit2-0.13.0 (30 Jun 2011) diff --git a/dev-libs/libgit2/files/libgit2-0.13.0-system-zlib.patch b/dev-libs/libgit2/files/libgit2-0.13.0-system-zlib.patch index 5353af03c36e..8f6dab51b373 100644 --- a/dev-libs/libgit2/files/libgit2-0.13.0-system-zlib.patch +++ b/dev-libs/libgit2/files/libgit2-0.13.0-system-zlib.patch @@ -1,22 +1,26 @@ --- libgit2-0.13.0/CMakeLists.txt.orig +++ libgit2-0.13.0/CMakeLists.txt -@@ -22,7 +22,14 @@ +@@ -22,7 +22,18 @@ SET(LIBGIT2_VERSION_STRING "${LIBGIT2_VERSION_MAJOR}.${LIBGIT2_VERSION_MINOR}.${LIBGIT2_VERSION_REV}") # Find required dependencies -INCLUDE_DIRECTORIES(deps/zlib src include) +INCLUDE_DIRECTORIES(src include) -+IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux") -+ find_package(ZLIB REQUIRED) -+ INCLUDE_DIRECTORIES( ${ZLIB_INCLUDE_DIRS} ) -+ELSE (${CMAKE_SYSTEM_NAME} MATCHES "Linux") ++IF (NOT WIN32) ++ find_package(ZLIB) ++ENDIF() ++ ++IF (ZLIB_FOUND) ++ INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS}) ++ LINK_LIBRARIES(${ZLIB_LIBRARIES}) ++ELSE (ZLIB_FOUND) + INCLUDE_DIRECTORIES(deps/zlib) + FILE(GLOB SRC_ZLIB deps/zlib/*.c) +ENDIF() # Installation paths SET(INSTALL_BIN bin CACHE PATH "Where to install binaries to.") -@@ -57,7 +64,6 @@ +@@ -57,7 +68,6 @@ # Collect sourcefiles FILE(GLOB SRC src/*.c src/backends/*.c) @@ -24,21 +28,3 @@ FILE(GLOB SRC_SHA1 src/block-sha1/*.c) FILE(GLOB SRC_PLAT src/unix/*.c) FILE(GLOB SRC_H include/git2/*.h) -@@ -70,7 +76,7 @@ - - # Compile and link libgit2 - ADD_LIBRARY(git2 ${SRC} ${SRC_PLAT} ${SRC_SHA1} ${SRC_ZLIB}) --TARGET_LINK_LIBRARIES(git2 ${CMAKE_THREAD_LIBS_INIT}) -+TARGET_LINK_LIBRARIES(git2 ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES}) - SET_TARGET_PROPERTIES(git2 PROPERTIES VERSION ${LIBGIT2_VERSION_STRING}) - SET_TARGET_PROPERTIES(git2 PROPERTIES SOVERSION ${LIBGIT2_VERSION_MAJOR}) - -@@ -92,7 +98,7 @@ - FILE(GLOB SRC_TEST tests/t??-*.c) - - 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}) -- TARGET_LINK_LIBRARIES(libgit2_test ${CMAKE_THREAD_LIBS_INIT}) -+ TARGET_LINK_LIBRARIES(libgit2_test ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES}) - - ENABLE_TESTING() - ADD_TEST(libgit2_test libgit2_test) |