diff options
| author | Long Nguyen <nguyen.long.908132@gmail.com> | 2021-05-29 00:09:56 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-28 10:09:56 -0700 |
| commit | a29126f785b1ace2b3ef9f600d4f3c8aed63cea2 (patch) | |
| tree | b2ff3afa84314817762a99650d6bcd90aca04077 /ports/libmagic/0012-Convert-MSYS2-paths-to-Windows-paths.patch | |
| parent | 0de461216d66a4d5ca1870254e27258a66f6e361 (diff) | |
| download | vcpkg-a29126f785b1ace2b3ef9f600d4f3c8aed63cea2.tar.gz vcpkg-a29126f785b1ace2b3ef9f600d4f3c8aed63cea2.zip | |
[tre, libmagic] Windows + mingw support (#17769)
* [tre] mingw support
* [libmagic] Windows support
* [libmagic] Apply @Neumann-A suggestions
* [libmagic] Add host dependency
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* [libmagic] Copy the magic file to the corresponding tools dir
* [ci baseline] libmagic now passes
* Update ports/libmagic/portfile.cmake
* [libmagic] Import patch from MSYS2
* [vcpkg baseline] Update libmagic, tre
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
Diffstat (limited to 'ports/libmagic/0012-Convert-MSYS2-paths-to-Windows-paths.patch')
| -rw-r--r-- | ports/libmagic/0012-Convert-MSYS2-paths-to-Windows-paths.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/ports/libmagic/0012-Convert-MSYS2-paths-to-Windows-paths.patch b/ports/libmagic/0012-Convert-MSYS2-paths-to-Windows-paths.patch new file mode 100644 index 000000000..728fe7753 --- /dev/null +++ b/ports/libmagic/0012-Convert-MSYS2-paths-to-Windows-paths.patch @@ -0,0 +1,24 @@ +From f0139ced57c1579450f3d09b6e3ae0159aae031b Mon Sep 17 00:00:00 2001 +From: Long Nguyen <nguyen.long.908132@gmail.com> +Date: Mon, 10 May 2021 08:43:28 +0700 +Subject: [PATCH 12/14] Convert MSYS2 paths to Windows paths + +--- + src/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 34781b9..26f853f 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,4 +1,7 @@ + MAGIC = $(pkgdatadir)/magic ++if MINGW ++MAGIC != cygpath -m -a -l '$(MAGIC)' ++endif + lib_LTLIBRARIES = libmagic.la + nodist_include_HEADERS = magic.h + +-- +2.29.2.windows.2 + |