diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-06-08 02:02:24 -0500 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-06-08 02:02:24 -0500 |
| commit | fd2bb2f751c13b3c0c002b8e012810902b9da364 (patch) | |
| tree | 17b2e38c966c9f96cfa568c1f572261a289590e6 /harmony/libgit2/build-both-static-dynamic.patch | |
| parent | b0a5136bf3326ba38b360be288d06f9a27f2a4d2 (diff) | |
| download | packages-fd2bb2f751c13b3c0c002b8e012810902b9da364.tar.gz packages-fd2bb2f751c13b3c0c002b8e012810902b9da364.tar.bz2 packages-fd2bb2f751c13b3c0c002b8e012810902b9da364.tar.xz packages-fd2bb2f751c13b3c0c002b8e012810902b9da364.zip | |
harmony -> system
Diffstat (limited to 'harmony/libgit2/build-both-static-dynamic.patch')
| -rw-r--r-- | harmony/libgit2/build-both-static-dynamic.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/harmony/libgit2/build-both-static-dynamic.patch b/harmony/libgit2/build-both-static-dynamic.patch deleted file mode 100644 index eeb179a1e..000000000 --- a/harmony/libgit2/build-both-static-dynamic.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: Jakub Jirutka <jakub@jirutka.cz> -Date: Mon, 11 Apr 2017 3:23:00 +0200 -Subject: [PATCH] Build both static and dynamic library - -This is very hack-ish, it makes option BUILD_SHARED_LIBS unusable. ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -28,7 +28,6 @@ - # Build options - # - OPTION( SONAME "Set the (SO)VERSION of the target" ON ) --OPTION( BUILD_SHARED_LIBS "Build Shared Library (OFF for Static)" ON ) - OPTION( THREADSAFE "Build libgit2 as threadsafe" ON ) - OPTION( BUILD_CLAR "Build Tests using the Clar suite" ON ) - OPTION( BUILD_EXAMPLES "Build library usage example apps" OFF ) -@@ -44,6 +43,8 @@ - OPTION( CURL "Use curl for HTTP if available" ON) - OPTION( DEBUG_POOL "Enable debug pool allocator" OFF ) - -+SET( BUILD_SHARED_LIBS ON ) -+ - IF(DEBUG_POOL) - ADD_DEFINITIONS(-DGIT_DEBUG_POOL) - ENDIF() -@@ -602,7 +603,8 @@ - ENDIF() - - # Compile and link libgit2 --ADD_LIBRARY(git2 ${SRC_H} ${SRC_GIT2} ${SRC_OS} ${SRC_ZLIB} ${SRC_HTTP} ${SRC_REGEX} ${SRC_SSH} ${SRC_SHA1} ${WIN_RC}) -+ADD_LIBRARY(objlib OBJECT ${SRC_H} ${SRC_GIT2} ${SRC_OS} ${SRC_ZLIB} ${SRC_HTTP} ${SRC_REGEX} ${SRC_SSH} ${SRC_SHA1} ${WIN_RC}) -+ADD_LIBRARY(git2 SHARED $<TARGET_OBJECTS:objlib>) - TARGET_LINK_LIBRARIES(git2 ${SECURITY_DIRS}) - TARGET_LINK_LIBRARIES(git2 ${COREFOUNDATION_DIRS}) - TARGET_LINK_LIBRARIES(git2 ${SSL_LIBRARIES}) -@@ -611,6 +613,9 @@ - TARGET_LINK_LIBRARIES(git2 ${ICONV_LIBRARIES}) - TARGET_OS_LIBRARIES(git2) - -+ADD_LIBRARY(git2_static STATIC $<TARGET_OBJECTS:objlib>) -+SET_TARGET_PROPERTIES(git2_static PROPERTIES OUTPUT_NAME git2 CLEAN_DIRECT_OUTPUT 1) -+ - # Workaround for Cmake bug #0011240 (see http://public.kitware.com/Bug/view.php?id=11240) - # Win64+MSVC+static libs = linker error - IF(MSVC AND GIT_ARCH_64 AND NOT BUILD_SHARED_LIBS) -@@ -639,7 +644,7 @@ - ENDIF () - - # Install --INSTALL(TARGETS git2 -+INSTALL(TARGETS git2 git2_static - RUNTIME DESTINATION ${BIN_INSTALL_DIR} - LIBRARY DESTINATION ${LIB_INSTALL_DIR} - ARCHIVE DESTINATION ${LIB_INSTALL_DIR} |