* [gentoo-commits] gentoo-x86 commit in dev-libs/libgit2/files: libgit2-0.13.0-system-zlib.patch
@ 2011-06-30 21:02 Tim Harder (radhermit)
0 siblings, 0 replies; 3+ messages in thread
From: Tim Harder (radhermit) @ 2011-06-30 21:02 UTC (permalink / raw
To: gentoo-commits
radhermit 11/06/30 21:02:40
Added: libgit2-0.13.0-system-zlib.patch
Log:
Initial import.
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
Revision Changes Path
1.1 dev-libs/libgit2/files/libgit2-0.13.0-system-zlib.patch
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
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
Index: libgit2-0.13.0-system-zlib.patch
===================================================================
--- libgit2-0.13.0/CMakeLists.txt.orig
+++ libgit2-0.13.0/CMakeLists.txt
@@ -22,7 +22,14 @@
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")
+ 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 @@
# Collect sourcefiles
FILE(GLOB SRC src/*.c src/backends/*.c)
-FILE(GLOB SRC_ZLIB deps/zlib/*.c)
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)
^ permalink raw reply [flat|nested] 3+ messages in thread* [gentoo-commits] gentoo-x86 commit in dev-libs/libgit2/files: libgit2-0.13.0-system-zlib.patch
@ 2011-06-30 22:06 Tim Harder (radhermit)
0 siblings, 0 replies; 3+ messages in thread
From: Tim Harder (radhermit) @ 2011-06-30 22:06 UTC (permalink / raw
To: gentoo-commits
radhermit 11/06/30 22:06:33
Modified: libgit2-0.13.0-system-zlib.patch
Log:
Use system zlib on all non-Windows systems if available.
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
Revision Changes Path
1.2 dev-libs/libgit2/files/libgit2-0.13.0-system-zlib.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgit2/files/libgit2-0.13.0-system-zlib.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgit2/files/libgit2-0.13.0-system-zlib.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgit2/files/libgit2-0.13.0-system-zlib.patch?r1=1.1&r2=1.2
Index: libgit2-0.13.0-system-zlib.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libgit2/files/libgit2-0.13.0-system-zlib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libgit2-0.13.0-system-zlib.patch 30 Jun 2011 21:02:39 -0000 1.1
+++ libgit2-0.13.0-system-zlib.patch 30 Jun 2011 22:06:33 -0000 1.2
@@ -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)
^ permalink raw reply [flat|nested] 3+ messages in thread* [gentoo-commits] gentoo-x86 commit in dev-libs/libgit2/files: libgit2-0.13.0-system-zlib.patch
@ 2011-07-14 6:54 Tim Harder (radhermit)
0 siblings, 0 replies; 3+ messages in thread
From: Tim Harder (radhermit) @ 2011-07-14 6:54 UTC (permalink / raw
To: gentoo-commits
radhermit 11/07/14 06:54:13
Removed: libgit2-0.13.0-system-zlib.patch
Log:
Version bump and remove old.
(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-07-14 6:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-30 21:02 [gentoo-commits] gentoo-x86 commit in dev-libs/libgit2/files: libgit2-0.13.0-system-zlib.patch Tim Harder (radhermit)
-- strict thread matches above, loose matches on Subject: below --
2011-06-30 22:06 Tim Harder (radhermit)
2011-07-14 6:54 Tim Harder (radhermit)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox