aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-06-05 17:45:32 +0100
committerRoss Burton <ross.burton@intel.com>2018-06-06 11:30:27 +0100
commitcc4726283e2694aa33f279525e9574648a6fe87c (patch)
treea5b563aaba8bb1c53ee49c08a869ff8f2b3050a2
parentdd69d45d32db2a7bed82f491bace1a4300327638 (diff)
downloadmeta-mingw-x11.tar.gz
meta-mingw-x11.tar.bz2
meta-mingw-x11.zip
libxdmcp: fix build under MinGWx11
Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--recipes-graphics/xorg-lib/libxdmcp/socket.patch35
-rw-r--r--recipes-graphics/xorg-lib/libxdmcp_%.bbappend3
2 files changed, 38 insertions, 0 deletions
diff --git a/recipes-graphics/xorg-lib/libxdmcp/socket.patch b/recipes-graphics/xorg-lib/libxdmcp/socket.patch
new file mode 100644
index 0000000..a4c389e
--- /dev/null
+++ b/recipes-graphics/xorg-lib/libxdmcp/socket.patch
@@ -0,0 +1,35 @@
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+From b10f382e3aa2e86cd5a2bc27d6758da55f0ab1f6 Mon Sep 17 00:00:00 2001
+From: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Sat, 13 Sep 2014 20:28:38 +0100
+Subject: Link with winsock library for socket functions on MinGW
+
+Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+Reviewed-by: David Macek <david.macek.0@gmail.com>
+---
+ configure.ac | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 608bab9..2288502 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,6 +55,14 @@ AC_PROG_LN_S
+ # Checks for libraries.
+ AC_SEARCH_LIBS([recvfrom],[socket])
+
++case $host_os in
++ *mingw*)
++ AC_CHECK_LIB([ws2_32],[main])
++ ;;
++ *)
++ ;;
++esac
++
+ # Checks for library functions.
+ AC_CHECK_LIB([bsd], [arc4random_buf])
+ AC_CHECK_FUNCS([srand48 lrand48 arc4random_buf])
+--
+cgit v1.1
diff --git a/recipes-graphics/xorg-lib/libxdmcp_%.bbappend b/recipes-graphics/xorg-lib/libxdmcp_%.bbappend
new file mode 100644
index 0000000..b9e4746
--- /dev/null
+++ b/recipes-graphics/xorg-lib/libxdmcp_%.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend_mingw32 := "${THISDIR}/${BPN}:"
+
+SRC_URI_append_mingw32 = " file://socket.patch"