mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-15 16:19:06 +08:00
a29126f785
* [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>
25 lines
592 B
Diff
25 lines
592 B
Diff
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
|
|
|