From 30a2af80f5f8c8ddf0f619e4f50451b02baa22dd Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 6 Aug 2019 23:07:56 +0100 Subject: libx11: replace libtool patch with upstreamed patch After iterating with upstream, this is the patch that landed. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../xorg-lib/libx11/fix-libtool.patch | 35 ----------------- .../xorg-lib/libx11/no-host-libtool.patch | 45 ++++++++++++++++++++++ 2 files changed, 45 insertions(+), 35 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/fix-libtool.patch create mode 100644 meta/recipes-graphics/xorg-lib/libx11/no-host-libtool.patch (limited to 'meta/recipes-graphics/xorg-lib/libx11') 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 @@ -Passing -all-static to libtool is done to avoid libtool wrappers on Windows, but -it means that the build host needs to have libc.a installed. This isn't the -case for a lot of distributions out of the box, so revert this commit. - -Filed a bug upstream to get a proper fix: https://gitlab.freedesktop.org/xorg/lib/libx11/issues/100 - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton - -From b9f74dc5e714115057a5a1789b4de202d6f58547 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Fri, 2 Aug 2019 00:39:39 +0100 -Subject: [PATCH 2/2] Revert "Avoid using libtool wrapper for makekeys" - -This reverts commit 4645e219133458781e3fb48eaea6a74cccb1b9aa. ---- - src/util/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/util/Makefile.am b/src/util/Makefile.am -index 37314370..a051567a 100644 ---- a/src/util/Makefile.am -+++ b/src/util/Makefile.am -@@ -10,7 +10,7 @@ AM_CPPFLAGS = \ - CC = @CC_FOR_BUILD@ - CPPFLAGS = @CPPFLAGS_FOR_BUILD@ - CFLAGS = @CFLAGS_FOR_BUILD@ --LDFLAGS = @LDFLAGS_FOR_BUILD@ -all-static -+LDFLAGS = @LDFLAGS_FOR_BUILD@ - LIBS = - EXEEXT = @EXEEXT_FOR_BUILD@ - --- -2.20.1 - 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 @@ +Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/lib/libx11/merge_requests/22] +Signed-off-by: Ross Burton + +From edc7680ed5a03cedb5facf14693823455e12c29c Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Tue, 6 Aug 2019 14:53:43 +0100 +Subject: [PATCH libX11] src/util/Makefile: explicitly reset LINK to not use + libtool + +Simply looking at libtool redefines LINK globally to use libtool, which when +you're trying to cross-compile to Windows can cause complications. + +As in src/util/ we're simply building a small binary for the build host, reset +LINK to the automake default so that the traditional compile/link steps occur +without libtool. + +Also remove -all-static from LDFLAGS as that is a libtool-specific argument +intended to solve this problem. + +Closes: #100 +Signed-off-by: Ross Burton +--- + src/util/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/util/Makefile.am b/src/util/Makefile.am +index 37314370..b7236530 100644 +--- a/src/util/Makefile.am ++++ b/src/util/Makefile.am +@@ -7,10 +7,11 @@ AM_CFLAGS = \ + AM_CPPFLAGS = \ + -I$(top_srcdir)/include + ++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CC = @CC_FOR_BUILD@ + CPPFLAGS = @CPPFLAGS_FOR_BUILD@ + CFLAGS = @CFLAGS_FOR_BUILD@ +-LDFLAGS = @LDFLAGS_FOR_BUILD@ -all-static ++LDFLAGS = @LDFLAGS_FOR_BUILD@ + LIBS = + EXEEXT = @EXEEXT_FOR_BUILD@ + +-- +2.20.1 + -- cgit 1.2.3-korg