[libxslt] Fix writing to locations outside vcpkg in Windows builds (#9242)

* [libxslt] Fix writing to locations outside vcpkg in Windows builds

* [libxslt] Add passing arm64-windows to baseline

4 files changed, 5 insertions, 32 deletions

diff --git a/ports/libxslt/0001-Fix-makefile.patch b/ports/libxslt/0001-Fix-makefile.patch
index 73d627860..8648a3fe5 100644
--- a/ports/libxslt/0001-Fix-makefile.patch
+++ b/ports/libxslt/0001-Fix-makefile.patch
@@ -6,32 +6,6 @@ diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
 index 23a02d2..b13dd26 100644
 --- a/win32/Makefile.msvc
 +++ b/win32/Makefile.msvc
-@@ -22,7 +22,7 @@ BASEDIR = ..
- XSLT_SRCDIR = $(BASEDIR)\libxslt
- EXSLT_SRCDIR = $(BASEDIR)\libexslt
- UTILS_SRCDIR = $(BASEDIR)\xsltproc
--BINDIR = bin.msvc
-+BINDIR = $(OUTDIR)\bin.msvc
- 
- # Names of various input and output components.
- XSLT_NAME = xslt
-@@ -39,11 +39,11 @@ EXSLT_DEF = $(EXSLT_BASENAME).def
- EXSLT_A = $(EXSLT_BASENAME)_a.lib
- 
- # Places where intermediate files produced by the compiler go
--XSLT_INTDIR = int.xslt.msvc
--XSLT_INTDIR_A = int.xslta.msvc
--EXSLT_INTDIR = int.exslt.msvc
--EXSLT_INTDIR_A = int.exslta.msvc
--UTILS_INTDIR = int.utils.msvc
-+XSLT_INTDIR = $(OUTDIR)\int.xslt.msvc
-+XSLT_INTDIR_A = $(OUTDIR)\int.xslta.msvc
-+EXSLT_INTDIR = $(OUTDIR)\int.exslt.msvc
-+EXSLT_INTDIR_A = $(OUTDIR)\int.exslta.msvc
-+UTILS_INTDIR = $(OUTDIR)\int.utils.msvc
- 
- # The preprocessor and its options.
- CPP = cl.exe /EP
 @@ -59,7 +59,13 @@ CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
  LD = link.exe
  LDFLAGS = /nologo
diff --git a/ports/libxslt/CONTROL b/ports/libxslt/CONTROL
index 6e3c7e2b4..1320ee2cd 100644
--- a/ports/libxslt/CONTROL
+++ b/ports/libxslt/CONTROL
@@ -1,5 +1,5 @@
 Source: libxslt
-Version: 1.1.33-5
+Version: 1.1.33-6
 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/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 83351593b..94fd57187 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -925,7 +925,6 @@ libwebsockets:arm-uwp=fail
 libwebsockets:x64-uwp=fail

 libxmp-lite:x64-linux=fail

 libxmp-lite:x64-osx=fail

-libxslt:arm64-windows=fail

 libxslt:arm-uwp=fail

 libxslt:x64-osx=fail

 libxslt:x64-uwp=fail

diff --git a/scripts/cmake/vcpkg_build_nmake.cmake b/scripts/cmake/vcpkg_build_nmake.cmake
index 33f1e9d1e..8cf074739 100644
--- a/scripts/cmake/vcpkg_build_nmake.cmake
+++ b/scripts/cmake/vcpkg_build_nmake.cmake
@@ -178,7 +178,7 @@ function(vcpkg_build_nmake)
             endforeach()

             

             if (_bn_PRERUN_SHELL)

-                message("Prerunning ${CURRENT_TRIPLET_NAME}")

+                message(STATUS "Prerunning ${CURRENT_TRIPLET_NAME}")

                 vcpkg_execute_required_process(

                     COMMAND ${_bn_PRERUN_SHELL}

                     WORKING_DIRECTORY ${OBJ_DIR}${_bn_PROJECT_SUBPATH}

@@ -186,7 +186,7 @@ function(vcpkg_build_nmake)
                 )

             endif()

             if (BUILDTYPE STREQUAL "debug" AND _bn_PRERUN_SHELL_DEBUG)

-                message("Prerunning ${CURRENT_TRIPLET_NAME}")

+                message(STATUS "Prerunning ${CURRENT_TRIPLET_NAME}")

                 vcpkg_execute_required_process(

                     COMMAND "${_bn_PRERUN_SHELL_DEBUG}"

                     WORKING_DIRECTORY ${OBJ_DIR}${_bn_PROJECT_SUBPATH}

@@ -194,11 +194,11 @@ function(vcpkg_build_nmake)
                 )

             endif()

             if (BUILDTYPE STREQUAL "release" AND _bn_PRERUN_SHELL_RELEASE)

-                message("Prerunning ${CURRENT_TRIPLET_NAME}")

+                message(STATUS "Prerunning ${CURRENT_TRIPLET_NAME}")

                 vcpkg_execute_required_process(

                     COMMAND ${_bn_PRERUN_SHELL_RELEASE}

                     WORKING_DIRECTORY ${OBJ_DIR}${_bn_PROJECT_SUBPATH}

-                    LOGNAME "prerun-${CURRENT_TRIPLET_NAME}-dbg"

+                    LOGNAME "prerun-${CURRENT_TRIPLET_NAME}-rel"

                 )

             endif()