diff options
| author | Sönke Schau <xgcssch@users.noreply.github.com> | 2020-05-18 19:45:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-18 10:45:46 -0700 |
| commit | 9f516b9347e993fd7692f4683e6cb35d1d24f913 (patch) | |
| tree | c5b3cf8282d748a39609c0a49c339fa4aee22fba | |
| parent | fb441358ab406dcb9deffef9b7d886237ca35d7e (diff) | |
| download | vcpkg-9f516b9347e993fd7692f4683e6cb35d1d24f913.tar.gz vcpkg-9f516b9347e993fd7692f4683e6cb35d1d24f913.zip | |
[gSoap] Update to 2.8.102 and re-enable x64 Builds (#11355)
* Update to 2.8.102 and reenable x64 Build
* Remove surplus empty directory during install
* Corrected the "Supports" entry in CONTROL
Should have read the documentation for "Supports" to see that this is a boolean expression
| -rw-r--r-- | ports/gsoap/CONTROL | 4 | ||||
| -rw-r--r-- | ports/gsoap/portfile.cmake | 11 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/ports/gsoap/CONTROL b/ports/gsoap/CONTROL index 2a0746ea4..1b804b558 100644 --- a/ports/gsoap/CONTROL +++ b/ports/gsoap/CONTROL @@ -1,6 +1,6 @@ Source: gsoap -Version: 2.8.93-3 +Version: 2.8.102 Build-Depends: curl Homepage: https://sourceforge.net/projects/gsoap2/ Description: The gSOAP toolkit is a C and C++ software development toolkit for SOAP and REST XML Web services and generic C/C++ XML data bindings. -Supports: x86 & windows
\ No newline at end of file +Supports: (x86 | x64) & windows diff --git a/ports/gsoap/portfile.cmake b/ports/gsoap/portfile.cmake index 4ca8d750a..15328eba2 100644 --- a/ports/gsoap/portfile.cmake +++ b/ports/gsoap/portfile.cmake @@ -1,9 +1,9 @@ -vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP" ON_ARCH "x64" "arm" "arm64") +vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP" ON_ARCH "arm" "arm64") vcpkg_download_distfile(ARCHIVE - URLS "https://downloads.sourceforge.net/project/gsoap2/gsoap-2.8/gsoap_2.8.93.zip" - FILENAME "gsoap_2.8.93.zip" - SHA512 45965d04e1c46e06803467887f62d9bea5909fa2d4c4d9ffc935f9fced014efed9169a0171a555067c89ef47b2def9983b277eecee18eb9e70d7198bc72b1ece + URLS "https://downloads.sourceforge.net/project/gsoap2/gsoap-2.8/gsoap_2.8.102.zip" + FILENAME "gsoap_2.8.102.zip" + SHA512 3cff65605b15f820c9d56e32575231fb6fb89927bafc1db85ac1f879acd8496d6f38b558e994d17cce475beae0976d5fafcff7f22b28cdfbec8b7ec4b08bcbe7 ) vcpkg_extract_source_archive_ex( @@ -50,6 +50,9 @@ file(COPY ${SOURCE_PATH}/gsoap/import DESTINATION ${CURRENT_PACKAGES_DIR}/share/ # Handle plugin files file(COPY ${SOURCE_PATH}/gsoap/plugin DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +# Cleanup surplus empty directory +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/gsoap/plugin/.deps") + # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL ${SOURCE_PATH}/INSTALL.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME install) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d5cd0eb56..3a69a2a78 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -585,8 +585,6 @@ gsl:x64-uwp=fail gsoap:x64-linux=fail
gsoap:x64-osx=fail
gsoap:x64-uwp=fail
-gsoap:x64-windows-static=fail
-gsoap:x64-windows=fail
gtk:x64-linux=fail
gtk:x86-windows=ignore
guetzli:x64-osx=fail
|