diff options
author | Ross Burton <ross.burton@intel.com> | 2019-08-06 23:07:56 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-08-08 10:19:56 +0100 |
commit | abda00c016e72e8aef67fd9f03e70121578e166c (patch) | |
tree | 74f57d54c114323b6b4062f695dfef909ef705fd /meta/recipes-graphics/xorg-lib/libx11/fix-libtool.patch | |
parent | cd1f08e28d84d11a141f71d0a0822e0c439a76b4 (diff) | |
download | openembedded-core-contrib-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>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11/fix-libtool.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11/fix-libtool.patch | 35 |
1 files changed, 0 insertions, 35 deletions
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 <ross.burton@intel.com> - -From b9f74dc5e714115057a5a1789b4de202d6f58547 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -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 - |