Skip to content

Commit

Permalink
[libevent] update to 2.1.11 (microsoft#7515)
Browse files Browse the repository at this point in the history
* [libevent] update to 2.1.11

* [libevent] Move scripts to tools folder

* [libevent] Fix non-Windows build

* [libevent] remove bin folder only for static build

and move script to tools folder no matter static or dynamic
  • Loading branch information
DailyShana authored and frabert committed Aug 7, 2019
1 parent 8c2ec9f commit da52abf
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 46 deletions.
2 changes: 1 addition & 1 deletion ports/libevent/CONTROL
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: libevent
Version: 2.1.10
Version: 2.1.11
Build-Depends: openssl
Homepage: https://github.com/libevent/libevent
Description: An event notification library
36 changes: 0 additions & 36 deletions ports/libevent/fix-arm_build.patch

This file was deleted.

21 changes: 12 additions & 9 deletions ports/libevent/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libevent/libevent
REF release-2.1.10-stable
SHA512 8c336df258f7a12164da739b0ea68bebcc8b2ea4f4a839300aa1c5edfb673ac5d6517f882ba04ab35d406489ddd682a319e39fa6784ac0cab73227d42e503a55
REF release-2.1.11-stable
SHA512 a34ca4ad4d55a989a4f485f929d0ed2438d070d0e12a19d90c2b12783a562419c64db6a2603b093d958a75246d14ffefc8730c69c90b1b2f48339bde947f0e02
PATCHES
fix-file_path.patch
fix-arm_build.patch
)

if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
Expand All @@ -34,16 +33,20 @@ vcpkg_configure_cmake(

vcpkg_install_cmake()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "windows" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
if (VCPKG_TARGET_IS_WINDOWS)
vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/libevent)
elseif (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share)
elseif (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
else ()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share)
endif()

file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/libevent/)
file(RENAME ${CURRENT_PACKAGES_DIR}/bin/event_rpcgen.py ${CURRENT_PACKAGES_DIR}/tools/libevent/event_rpcgen.py)

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
endif()

vcpkg_copy_pdbs()

file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libevent)
Expand Down

0 comments on commit da52abf

Please sign in to comment.