summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-08-06 23:07:56 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-08 10:19:56 +0100
commitabda00c016e72e8aef67fd9f03e70121578e166c (patch)
tree74f57d54c114323b6b4062f695dfef909ef705fd
parentcd1f08e28d84d11a141f71d0a0822e0c439a76b4 (diff)
downloadpoky-abda00c016e72e8aef67fd9f03e70121578e166c.tar.gz
libx11: replace libtool patch with upstreamed patch
After iterating with upstream, this is the patch that landed. (From OE-Core rev: 30a2af80f5f8c8ddf0f619e4f50451b02baa22dd) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11.inc2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/fix-libtool.patch35
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/no-host-libtool.patch45
3 files changed, 46 insertions, 36 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index 994c33a8ef..cce0cb9929 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -11,7 +11,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:"
11PE = "1" 11PE = "1"
12 12
13SRC_URI += "file://Fix-hanging-issue-in-_XReply.patch \ 13SRC_URI += "file://Fix-hanging-issue-in-_XReply.patch \
14 file://fix-libtool.patch \ 14 file://no-host-libtool.patch \
15 file://no-host-x.patch" 15 file://no-host-x.patch"
16 16
17SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f" 17SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f"
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-libtool.patch b/meta/recipes-graphics/xorg-lib/libx11/fix-libtool.patch
deleted file mode 100644
index 678b7aff44..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11/fix-libtool.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1Passing -all-static to libtool is done to avoid libtool wrappers on Windows, but
2it means that the build host needs to have libc.a installed. This isn't the
3case for a lot of distributions out of the box, so revert this commit.
4
5Filed a bug upstream to get a proper fix: https://gitlab.freedesktop.org/xorg/lib/libx11/issues/100
6
7Upstream-Status: Inappropriate
8Signed-off-by: Ross Burton <ross.burton@intel.com>
9
10From b9f74dc5e714115057a5a1789b4de202d6f58547 Mon Sep 17 00:00:00 2001
11From: Ross Burton <ross.burton@intel.com>
12Date: Fri, 2 Aug 2019 00:39:39 +0100
13Subject: [PATCH 2/2] Revert "Avoid using libtool wrapper for makekeys"
14
15This reverts commit 4645e219133458781e3fb48eaea6a74cccb1b9aa.
16---
17 src/util/Makefile.am | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/src/util/Makefile.am b/src/util/Makefile.am
21index 37314370..a051567a 100644
22--- a/src/util/Makefile.am
23+++ b/src/util/Makefile.am
24@@ -10,7 +10,7 @@ AM_CPPFLAGS = \
25 CC = @CC_FOR_BUILD@
26 CPPFLAGS = @CPPFLAGS_FOR_BUILD@
27 CFLAGS = @CFLAGS_FOR_BUILD@
28-LDFLAGS = @LDFLAGS_FOR_BUILD@ -all-static
29+LDFLAGS = @LDFLAGS_FOR_BUILD@
30 LIBS =
31 EXEEXT = @EXEEXT_FOR_BUILD@
32
33--
342.20.1
35
diff --git a/meta/recipes-graphics/xorg-lib/libx11/no-host-libtool.patch b/meta/recipes-graphics/xorg-lib/libx11/no-host-libtool.patch
new file mode 100644
index 0000000000..56d9983b13
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11/no-host-libtool.patch
@@ -0,0 +1,45 @@
1Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/lib/libx11/merge_requests/22]
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From edc7680ed5a03cedb5facf14693823455e12c29c Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Tue, 6 Aug 2019 14:53:43 +0100
7Subject: [PATCH libX11] src/util/Makefile: explicitly reset LINK to not use
8 libtool
9
10Simply looking at libtool redefines LINK globally to use libtool, which when
11you're trying to cross-compile to Windows can cause complications.
12
13As in src/util/ we're simply building a small binary for the build host, reset
14LINK to the automake default so that the traditional compile/link steps occur
15without libtool.
16
17Also remove -all-static from LDFLAGS as that is a libtool-specific argument
18intended to solve this problem.
19
20Closes: #100
21Signed-off-by: Ross Burton <ross.burton@intel.com>
22---
23 src/util/Makefile.am | 3 ++-
24 1 file changed, 2 insertions(+), 1 deletion(-)
25
26diff --git a/src/util/Makefile.am b/src/util/Makefile.am
27index 37314370..b7236530 100644
28--- a/src/util/Makefile.am
29+++ b/src/util/Makefile.am
30@@ -7,10 +7,11 @@ AM_CFLAGS = \
31 AM_CPPFLAGS = \
32 -I$(top_srcdir)/include
33
34+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
35 CC = @CC_FOR_BUILD@
36 CPPFLAGS = @CPPFLAGS_FOR_BUILD@
37 CFLAGS = @CFLAGS_FOR_BUILD@
38-LDFLAGS = @LDFLAGS_FOR_BUILD@ -all-static
39+LDFLAGS = @LDFLAGS_FOR_BUILD@
40 LIBS =
41 EXEEXT = @EXEEXT_FOR_BUILD@
42
43--
442.20.1
45