diff options
| author | Kai Pastor <dg0yt@darc.de> | 2021-05-18 09:16:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-18 00:16:53 -0700 |
| commit | 38e7e0367e647fa3c0a8e6eeae89a9f6193a9115 (patch) | |
| tree | 0f5a14a0427f20427c13b1ae6ef9c43e3c30bc34 | |
| parent | ca466d339ea8673a8702d04374df40e1782f1430 (diff) | |
| download | vcpkg-38e7e0367e647fa3c0a8e6eeae89a9f6193a9115.tar.gz vcpkg-38e7e0367e647fa3c0a8e6eeae89a9f6193a9115.zip | |
[vcpkg baseline][libmicrohttpd] Control dependencies, doc, examples, test (#17653)
* Quote filepath expressions
* Add mingw support
* Disable https, doc, examples, (curl) tests
* Declare gettext dependency
* x-add-version
* Disable gnutls in addition to disabling https
* x-add-version
| -rw-r--r-- | ports/libmicrohttpd/CONTROL | 6 | ||||
| -rw-r--r-- | ports/libmicrohttpd/portfile.cmake | 18 | ||||
| -rw-r--r-- | ports/libmicrohttpd/vcpkg.json | 14 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/l-/libmicrohttpd.json | 5 |
5 files changed, 32 insertions, 13 deletions
diff --git a/ports/libmicrohttpd/CONTROL b/ports/libmicrohttpd/CONTROL deleted file mode 100644 index 3a77ac72b..000000000 --- a/ports/libmicrohttpd/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libmicrohttpd
-Version: 0.9.63
-Port-Version: 5
-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)
\ No newline at end of file diff --git a/ports/libmicrohttpd/portfile.cmake b/ports/libmicrohttpd/portfile.cmake index 993ba722b..2b09dac0f 100644 --- a/ports/libmicrohttpd/portfile.cmake +++ b/ports/libmicrohttpd/portfile.cmake @@ -11,12 +11,12 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive_ex( - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" OUT_SOURCE_PATH SOURCE_PATH PATCHES fix-msvc-project.patch ) -if (VCPKG_TARGET_IS_WINDOWS) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(CFG_SUFFIX "dll") else() @@ -30,19 +30,25 @@ if (VCPKG_TARGET_IS_WINDOWS) DEBUG_CONFIGURATION "Debug-${CFG_SUFFIX}" ) - file(GLOB MICROHTTPD_HEADERS ${SOURCE_PATH}/src/include/microhttpd*.h) - file(COPY ${MICROHTTPD_HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include) + file(GLOB MICROHTTPD_HEADERS "${SOURCE_PATH}/src/include/microhttpd*.h") + file(COPY ${MICROHTTPD_HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include") else() if(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(ENV{LIBS} "$ENV{LIBS} -framework Foundation -framework AppKit") # TODO: Get this from the extracted cmake vars somehow endif() vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + --disable-doc + --disable-examples + --disable-curl + --disable-https + --with-gnutls=no ) vcpkg_install_make() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") endif() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libmicrohttpd/vcpkg.json b/ports/libmicrohttpd/vcpkg.json new file mode 100644 index 000000000..d8a44ce57 --- /dev/null +++ b/ports/libmicrohttpd/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "libmicrohttpd", + "version": "0.9.63", + "port-version": 6, + "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", + "homepage": "https://www.gnu.org/software/libmicrohttpd/", + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "gettext", + "platform": "!windows" + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 474c0ede3..19c985145 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3278,7 +3278,7 @@ }, "libmicrohttpd": { "baseline": "0.9.63", - "port-version": 5 + "port-version": 6 }, "libmikmod": { "baseline": "3.3.11.1-8", diff --git a/versions/l-/libmicrohttpd.json b/versions/l-/libmicrohttpd.json index 14d69f741..9ac94ed3a 100644 --- a/versions/l-/libmicrohttpd.json +++ b/versions/l-/libmicrohttpd.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "c221d15de1cc1eedc33f912269d69d5ade11e3c1", + "version": "0.9.63", + "port-version": 6 + }, + { "git-tree": "da43ec88147e3aa99a5d4e7378f0011a92a25ad2", "version-string": "0.9.63", "port-version": 5 |
