Skip to content

Commit

Permalink
[jemalloc]Fix dll generated when generating static library
Browse files Browse the repository at this point in the history
  • Loading branch information
JackBoosY committed Mar 27, 2019
1 parent 195e4aa commit a833bf5
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 4 deletions.
2 changes: 1 addition & 1 deletion ports/jemalloc/CONTROL
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: jemalloc
Version: 4.3.1-2
Version: 4.3.1-3
Description: jemalloc is a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support
Build-Depends:
25 changes: 25 additions & 0 deletions ports/jemalloc/fix-static-build.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b8959a..55e6a5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -826,10 +826,16 @@ endif()
install(FILES include/jemalloc/jemalloc${install_suffix}.h
DESTINATION include/jemalloc)

-install(TARGETS ${LIBJEMALLOCSO}
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib)
+if (without-export)
+ install(TARGETS ${C_JETLIB}
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib)
+else()
+ install(TARGETS ${LIBJEMALLOCSO}
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib)
+endif()
if (build-tests)
##################################################################
# Common source for Unit, Integration and stress test libraries
12 changes: 9 additions & 3 deletions ports/jemalloc/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,21 @@ vcpkg_from_github(
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
"${CMAKE_CURRENT_LIST_DIR}/fix-cmakelists.patch"
"${CMAKE_CURRENT_LIST_DIR}/fix-utilities.patch"
fix-cmakelists.patch
fix-utilities.patch
fix-static-build.patch
)

if (VCPKG_CRT_LINKAGE STREQUAL "dynamic")
set(BUILD_STATIC_LIBRARY OFF)
else()
set(BUILD_STATIC_LIBRARY ON)
endif()
vcpkg_configure_cmake(
DISABLE_PARALLEL_CONFIGURE
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS -DGIT_FOUND=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
OPTIONS -DGIT_FOUND=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON -Dwithout-export=${BUILD_STATIC_LIBRARY}
)

vcpkg_install_cmake()
Expand Down

0 comments on commit a833bf5

Please sign in to comment.