Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[libmicrohttpd] Add platform.h to restricted header list. #12455

Merged
merged 1 commit into from
Jul 21, 2020
Merged

[libmicrohttpd] Add platform.h to restricted header list. #12455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ports/libmicrohttpd/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Source: libmicrohttpd
Version: 0.9.63-3
Version: 0.9.63
Port-Version: 4
Homepage: https://www.gnu.org/software/libmicrohttpd/
Description: GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application
Supports: !(arm|uwp)
31 changes: 11 additions & 20 deletions ports/libmicrohttpd/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "arm")
set(MICROHTTPD_VERSION 0.9.63)

vcpkg_download_distfile(ARCHIVE
URLS "https://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-${MICROHTTPD_VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-${MICROHTTPD_VERSION}.tar.gz"
URLS
"https://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-${MICROHTTPD_VERSION}.tar.gz"
"https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-${MICROHTTPD_VERSION}.tar.gz"
FILENAME "libmicrohttpd-${MICROHTTPD_VERSION}.tar.gz"
SHA512 cb99e7af84fb6d7c0fd3894a9dc0fbff14959b35347506bd3211a65bbfad36455007b9e67493e97c9d8394834408df10eeabdc7758573e6aae0ba6f5f87afe17
)
Expand All @@ -15,32 +17,21 @@ vcpkg_extract_source_archive_ex(
)

if (VCPKG_TARGET_IS_WINDOWS)
if (TRIPLET_SYSTEM_ARCH MATCHES "x86")
set(MSBUILD_PLATFORM "Win32")
else ()
set(MSBUILD_PLATFORM "x64")
endif()

if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(MICROHTTPD_CONFIGURATION_RELEASE "Release-dll")
set(MICROHTTPD_CONFIGURATION_DEBUG "Debug-dll")
if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
set(CFG_SUFFIX "dll")
else()
set(MICROHTTPD_CONFIGURATION_RELEASE "Release-static")
set(MICROHTTPD_CONFIGURATION_DEBUG "Debug-static")
set(CFG_SUFFIX "static")
endif()

vcpkg_install_msbuild(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
PROJECT_SUBPATH w32/VS2015/libmicrohttpd.vcxproj
PLATFORM ${MSBUILD_PLATFORM}
RELEASE_CONFIGURATION ${MICROHTTPD_CONFIGURATION_RELEASE}
DEBUG_CONFIGURATION ${MICROHTTPD_CONFIGURATION_DEBUG}
RELEASE_CONFIGURATION "Release-${CFG_SUFFIX}"
DEBUG_CONFIGURATION "Debug-${CFG_SUFFIX}"
)

file(GLOB MICROHTTPD_HEADERS ${SOURCE_PATH}/src/include/*h)
foreach(MICROHTTPD_HEADER ${MICROHTTPD_HEADERS})
file(COPY ${MICROHTTPD_HEADER} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
endforeach()
file(GLOB MICROHTTPD_HEADERS ${SOURCE_PATH}/src/include/microhttpd*.h)
file(COPY ${MICROHTTPD_HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
else()
vcpkg_configure_make(
SOURCE_PATH "${SOURCE_PATH}"
Expand Down
1 change: 1 addition & 0 deletions toolsrc/src/vcpkg/postbuildlint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ namespace vcpkg::PostBuildLint
"config.h",
"local.h",
"slice.h",
"platform.h",
};
static constexpr Span<const StringLiteral> restricted_lists[] = {
restricted_sys_filenames, restricted_crt_filenames, restricted_general_filenames};
Expand Down