diff options
| author | heydojo <heydojo@users.noreply.github.com> | 2019-11-18 22:04:25 +0000 |
|---|---|---|
| committer | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-11-18 14:04:25 -0800 |
| commit | d02bfe065d1ed48e00cc41d4f6a274541cd4603e (patch) | |
| tree | b9baeec32e5df342df717f49e1049c252b5d1107 /ports/libxslt | |
| parent | df4773c05614eb19084ae4db1fbc1bb3295d3ec6 (diff) | |
| download | vcpkg-d02bfe065d1ed48e00cc41d4f6a274541cd4603e.tar.gz vcpkg-d02bfe065d1ed48e00cc41d4f6a274541cd4603e.zip | |
Prevent python3 build failure (#9014)
* Prevent python3 build failure
If VCPKG_BUILD_TYPE release is set inside a
triplet, then the build will fail because
the port file attempts to deal with debug
files which will never exist. The changes
in this patch allow the build to succeed
if VCPKG_BUILD_TYPE release is stipulated
using a triplet before a build of the
python3 port is initiated.
* python3 version bump
Port clean up and version number
bump.
* libxslt release triplet build fix
This patch fixes a condition where
if a debug build is disabled via
triplet, the build fails and an
empty directory error message
is sent to the console.
Diffstat (limited to 'ports/libxslt')
| -rw-r--r-- | ports/libxslt/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libxslt/portfile.cmake | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/ports/libxslt/CONTROL b/ports/libxslt/CONTROL index 8f5d4de53..6e3c7e2b4 100644 --- a/ports/libxslt/CONTROL +++ b/ports/libxslt/CONTROL @@ -1,5 +1,5 @@ Source: libxslt -Version: 1.1.33-4 +Version: 1.1.33-5 Homepage: https://github.com/GNOME/libxslt Description: Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT Build-Depends: libxml2, liblzma diff --git a/ports/libxslt/portfile.cmake b/ports/libxslt/portfile.cmake index 68dc53654..5ab963bff 100644 --- a/ports/libxslt/portfile.cmake +++ b/ports/libxslt/portfile.cmake @@ -14,7 +14,9 @@ vcpkg_from_github( if (VCPKG_TARGET_IS_WINDOWS) # Create some directories ourselves, because the makefile doesn't file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) + endif() set(CONFIGURE_COMMAND_TEMPLATE cruntime=@CRUNTIME@ debug=@DEBUGMODE@ @@ -147,7 +149,9 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/tools) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -vcpkg_copy_pdbs() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_copy_pdbs() +endif() file(INSTALL ${SOURCE_PATH}/Copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) |