aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralmikhayl <almikhayl@users.noreply.github.com>2019-12-20 22:59:02 +0300
committerdan-shaw <51385773+dan-shaw@users.noreply.github.com>2019-12-20 11:59:02 -0800
commitfad13cc50c3df9f1e8e316bd47482cf3d03f0433 (patch)
treef31cbfd2a0905fd26c1252f09dce39e88906b1c8
parent52d71092193952cc5859e56c7bb0990b5d4e5d00 (diff)
downloadvcpkg-fad13cc50c3df9f1e8e316bd47482cf3d03f0433.tar.gz
vcpkg-fad13cc50c3df9f1e8e316bd47482cf3d03f0433.zip
[libpcap] update portfile for cmake build and bump version to 1.9.1 (#9329)
-rw-r--r--ports/libpcap/CONTROL3
-rw-r--r--ports/libpcap/portfile.cmake90
2 files changed, 34 insertions, 59 deletions
diff --git a/ports/libpcap/CONTROL b/ports/libpcap/CONTROL
index c0509704c..3c60fc840 100644
--- a/ports/libpcap/CONTROL
+++ b/ports/libpcap/CONTROL
@@ -1,3 +1,4 @@
Source: libpcap
-Version: 1.9.0
+Version: 1.9.1
Description: A portable C/C++ library for network traffic capture
+Homepage: https://www.tcpdump.org/
diff --git a/ports/libpcap/portfile.cmake b/ports/libpcap/portfile.cmake
index 665e6b603..74caa4631 100644
--- a/ports/libpcap/portfile.cmake
+++ b/ports/libpcap/portfile.cmake
@@ -1,75 +1,49 @@
-include(vcpkg_common_functions)
-
-vcpkg_download_distfile(
- SOURCE_ARCHIVE_PATH
- URLS http://www.tcpdump.org/release/libpcap-1.9.0.tar.gz
- FILENAME libpcap-1.9.0.tar.gz
- SHA512 0ff25641f1e9d29082766caef45888c19214f770c4f378818caa73fcbc4ae54ad9195549c2499d4879ff46e35741d93b2b02cc5f3d6aa99e85a32194cf10bfe7
-)
-
-vcpkg_extract_source_archive_ex(
- OUT_SOURCE_PATH SOURCE_PATH
- ARCHIVE ${SOURCE_ARCHIVE_PATH}
- REF 1.9.0
-)
-
-if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
- message(FATAL_ERROR "Package only supports linux platform.")
-endif()
+vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux platform" ON_TARGET "Windows" "OSX")
message(
"libpcap currently requires the following libraries from the system package manager:
flex
libbison-dev
-
These can be installed on Ubuntu systems via sudo apt install flex libbison-dev"
)
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
- set(SHARED_STATIC --enable-static --disable-shared)
-else()
- set(SHARED_STATIC --disable-static --enable-shared)
-endif()
-
-set(OPTIONS ${SHARED_STATIC})
-
-file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
-file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
-message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
-set(CFLAGS "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG} -fPIC -O0 -g -I${SOURCE_PATH}/include")
-set(LDFLAGS "${VCPKG_LINKER_FLAGS}")
-vcpkg_execute_required_process(
- COMMAND ${SOURCE_PATH}/configure --prefix=${CURRENT_PACKAGES_DIR}/debug ${OPTIONS} --with-sysroot=${CURRENT_INSTALLED_DIR}/debug --enable-usb=no --enable-netmap=no --enable-bluetooth=no --enable-dbus=no --enable-rdma=no --enable-shared=no --with-libnl=no
- WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
- LOGNAME configure-${TARGET_TRIPLET}-dbg
-)
-message(STATUS "Building ${TARGET_TRIPLET}-dbg")
-vcpkg_execute_required_process(
- COMMAND make -j install "CFLAGS=${CFLAGS}" "LDFLAGS=${LDFLAGS}"
- WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
- LOGNAME install-${TARGET_TRIPLET}-dbg
+vcpkg_download_distfile(
+ SOURCE_ARCHIVE_PATH
+ URLS http://www.tcpdump.org/release/libpcap-1.9.1.tar.gz
+ FILENAME libpcap-1.9.1.tar.gz
+ SHA512 ae0d6b0ad8253e7e059336c0f4ed3850d20d7d2f4dc1d942c2951f99a5443a690f0cc42c6f8fdc4a0ccb19e9e985192ba6f399c4bde2c7076e420f547fddfb08
)
-file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
-file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
-message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
-set(CFLAGS "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE} -fPIC -O3 -I${SOURCE_PATH}/include")
-set(LDFLAGS "${VCPKG_LINKER_FLAGS}")
-vcpkg_execute_required_process(
- COMMAND ${SOURCE_PATH}/configure --prefix=${CURRENT_PACKAGES_DIR} ${OPTIONS} --with-sysroot=${CURRENT_INSTALLED_DIR} --enable-usb=no --enable-netmap=no --enable-bluetooth=no --enable-dbus=no --enable-rdma=no --enable-shared=no --with-libnl=no
- WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
- LOGNAME configure-${TARGET_TRIPLET}-rel
+vcpkg_extract_source_archive_ex(
+ OUT_SOURCE_PATH SOURCE_PATH
+ ARCHIVE ${SOURCE_ARCHIVE_PATH}
+ REF 1.9.1
)
-message(STATUS "Building ${TARGET_TRIPLET}-rel")
-vcpkg_execute_required_process(
- COMMAND make -j install "CFLAGS=${CFLAGS}" "LDFLAGS=${LDFLAGS}"
- WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
- LOGNAME install-${TARGET_TRIPLET}-rel
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DDISABLE_USB=ON
+ -DDISABLE_NETMAP=ON
+ -DDISABLE_BLUETOOTH=ON
+ -DDISABLE_DBUS=ON
+ -DDISABLE_RDMA=ON
)
+vcpkg_install_cmake()
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libpcap RENAME copyright)
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
endif()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
-configure_file(${SOURCE_PATH}/README.md ${CURRENT_PACKAGES_DIR}/share/libpcap/copyright COPYONLY)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/share/man)
+
+file(READ ${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpcap.pc LIBPCAP_PC)
+string(REGEX REPLACE \($|\n\)prefix=[^\n]+ \\1prefix=\"${CURRENT_INSTALLED_DIR}\" LIBPCAP_PC_FIXED "${LIBPCAP_PC}")
+file(WRITE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpcap.pc "${LIBPCAP_PC_FIXED}")
+
+file(READ ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpcap.pc DEBUG_LIBPCAP_PC)
+string(REGEX REPLACE \($|\n\)prefix=[^\n]+ \\1prefix=\"${CURRENT_INSTALLED_DIR}/debug\" DEBUG_LIBPCAP_PC_FIXED "${DEBUG_LIBPCAP_PC}")
+file(WRITE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpcap.pc "${DEBUG_LIBPCAP_PC_FIXED}")