[vlc-devel] [PATCH] contrib: gpg-error: add support for the *-w64-mingw32uwp-* triplet

Steve Lhomme robux4 at ycbcr.xyz
Thu Apr 9 10:28:18 CEST 2020


---
 contrib/src/gpg-error/gpg-error-mingw32uwp.patch | 11 +++++++++++
 contrib/src/gpg-error/rules.mak                  |  2 ++
 2 files changed, 13 insertions(+)
 create mode 100644 contrib/src/gpg-error/gpg-error-mingw32uwp.patch

diff --git a/contrib/src/gpg-error/gpg-error-mingw32uwp.patch b/contrib/src/gpg-error/gpg-error-mingw32uwp.patch
new file mode 100644
index 00000000000..c59f1c1e105
--- /dev/null
+++ b/contrib/src/gpg-error/gpg-error-mingw32uwp.patch
@@ -0,0 +1,11 @@
+--- libgpg-error/src/mkheader.c.uwp	2020-04-08 13:46:31.572086200 +0200
++++ libgpg-error/src/mkheader.c	2020-04-08 13:46:41.763036700 +0200
+@@ -514,7 +514,7 @@ write_special (const char *fname, int ln
+     }
+   else if (!strcmp (tag, "include:os-add"))
+     {
+-      if (!strcmp (host_os, "mingw32"))
++      if (!strcmp (host_os, "mingw32") || !strcmp (host_os, "mingw32uwp"))
+         {
+           include_file (fname, lnr, "w32-add.h", write_line);
+         }
diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak
index a22c7786324..729f5cbea59 100644
--- a/contrib/src/gpg-error/rules.mak
+++ b/contrib/src/gpg-error/rules.mak
@@ -25,7 +25,9 @@ endif
 	$(APPLY) $(SRC)/gpg-error/version-bump-gawk-5.patch
 	$(APPLY) $(SRC)/gpg-error/win32-extern-struct.patch
 	$(APPLY) $(SRC)/gpg-error/darwin-triplet.patch
+	$(APPLY) $(SRC)/gpg-error/gpg-error-mingw32uwp.patch
 	$(MOVE)
+	cp $@/src/syscfg/lock-obj-pub.mingw32.h $@/src/syscfg/lock-obj-pub.mingw32uwp.h
 ifdef HAVE_ANDROID
 ifeq ($(ARCH),aarch64)
 	# x86_64-linux-gnu matches exactly what gets generated by gen-posix-lock-obj on arm64
-- 
2.17.1



More information about the vlc-devel mailing list