diff options
| author | Drew DeVault <sir@cmpwn.com> | 2019-04-16 18:42:56 -0400 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2019-04-17 14:55:32 +0000 |
| commit | 8383675cc1a4e5abe90be16b72b4029d51ecad63 (patch) | |
| tree | 5632e8269643bdb3e20d050d4ac93d9076101b4b /main/libgit2/build-both-static-dynamic.patch | |
| parent | 212df81b24ed85e6c24faccf338b08bb73739f4b (diff) | |
| download | aports-8383675cc1a4e5abe90be16b72b4029d51ecad63.tar.bz2 aports-8383675cc1a4e5abe90be16b72b4029d51ecad63.tar.xz | |
main/libgit2: update to 0.28.1
Diffstat (limited to 'main/libgit2/build-both-static-dynamic.patch')
| -rw-r--r-- | main/libgit2/build-both-static-dynamic.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/main/libgit2/build-both-static-dynamic.patch b/main/libgit2/build-both-static-dynamic.patch deleted file mode 100644 index 9912727a6b..0000000000 --- a/main/libgit2/build-both-static-dynamic.patch +++ /dev/null @@ -1,49 +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 -@@ -39,7 +39,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 ) -@@ -58,6 +57,8 @@ - OPTION( DEBUG_POOL "Enable debug pool allocator" OFF ) - OPTION( ENABLE_WERROR "Enable compilation with -Werror" OFF ) - OPTION( USE_BUNDLED_ZLIB "Use the bundled version of zlib" OFF ) -+ -+SET( BUILD_SHARED_LIBS ON ) - - IF (UNIX AND NOT APPLE) - OPTION( ENABLE_REPRODUCIBLE_BUILDS "Enable reproducible builds" OFF ) ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -407,9 +407,12 @@ - ENDIF() - - # Compile and link libgit2 --ADD_LIBRARY(git2 ${WIN_RC} ${LIBGIT2_OBJECTS}) -+ADD_LIBRARY(git2 SHARED ${WIN_RC} ${LIBGIT2_OBJECTS}) - TARGET_LINK_LIBRARIES(git2 ${LIBGIT2_LIBS}) - -+ADD_LIBRARY(git2_static STATIC ${WIN_RC} ${LIBGIT2_OBJECTS}) -+SET_TARGET_PROPERTIES(git2_static PROPERTIES OUTPUT_NAME git2 CLEAN_DIRECT_OUTPUT 1) -+ - SET_TARGET_PROPERTIES(git2 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${libgit2_BINARY_DIR}) - SET_TARGET_PROPERTIES(git2 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${libgit2_BINARY_DIR}) - SET_TARGET_PROPERTIES(git2 PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${libgit2_BINARY_DIR}) -@@ -445,7 +448,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} |