diff options
| author |   Ross Burton <ross.burton@intel.com> | 2019-08-02 21:37:19 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-08-03 23:56:01 +0100 |
| commit | dad9cd5cca1a09f33f0fd82a6bcbed31936ad6c8 (patch) | |
| tree | 5c8dde1092055ee949d8f013c2dba880e164606c /meta/recipes-graphics/xorg-lib/libx11/fix-libtool.patch | |
| parent | ad3edec70d07932caa390ff0e794695a83884364 (diff) | |
| download | openembedded-core-contrib-dad9cd5cca1a09f33f0fd82a6bcbed31936ad6c8.tar.gz | |
libx11: update to 1.6.8
Fix the build when the host doesn't have libc.a installed by reverting an
upstream commit, and cherry-pick a build fix from master.
Drop a redundant sed, the expression it removes doesn't exist anymore.
Move most patches to libx11.inc so that they're applied to both libx11 and libx11-diet.
(From OE-Core rev: 8bb48ac237315e83837973ecd1488060ec170588)
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, 35 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-libtool.patch b/meta/recipes-graphics/xorg-lib/libx11/fix-libtool.patch new file mode 100644 index 0000000000..678b7aff44 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11/fix-libtool.patch @@ -0,0 +1,35 @@ +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 + |