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 14:47:31 +0100 |
commit | 8bb48ac237315e83837973ecd1488060ec170588 (patch) | |
tree | 20c89bdbb03b872ff827ffa513e1066daccd4deb /meta/recipes-graphics/xorg-lib | |
parent | b40277355b4ecf041061b3db0d4d890c7033e96f (diff) | |
download | openembedded-core-contrib-8bb48ac237315e83837973ecd1488060ec170588.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.
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')
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11-diet_1.6.8.bb (renamed from meta/recipes-graphics/xorg-lib/libx11-diet_1.6.7.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11.inc | 8 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11/fix-libtool.patch | 35 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch | 40 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb | 13 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11_1.6.8.bb | 7 |
6 files changed, 88 insertions, 15 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.7.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.8.bb index 9c773a09dd..9c773a09dd 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.7.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.8.bb diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc index ea2ebfb8b9..994c33a8ef 100644 --- a/meta/recipes-graphics/xorg-lib/libx11.inc +++ b/meta/recipes-graphics/xorg-lib/libx11.inc @@ -10,8 +10,12 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:" PE = "1" -SRC_URI[md5sum] = "034fdd6cc5393974d88aec6f5bc96162" -SRC_URI[sha256sum] = "910e9e30efba4ad3672ca277741c2728aebffa7bc526f04dcfa74df2e52a1348" +SRC_URI += "file://Fix-hanging-issue-in-_XReply.patch \ + file://fix-libtool.patch \ + file://no-host-x.patch" + +SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f" +SRC_URI[sha256sum] = "b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5" PROVIDES = "virtual/libx11" 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 + diff --git a/meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch b/meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch new file mode 100644 index 0000000000..803f8b408c --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch @@ -0,0 +1,40 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From cf2ef27831173c5ed6f98be3c39caff18fd4e7f1 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Mon, 17 Jun 2019 13:36:08 -0400 +Subject: [PATCH 1/2] makekeys: Detach ourselves from X headers entirely + +Subsequent to a121b7b0c210efe10bf93453b29050282324c906 we are no longer +building makekeys with enough -I/foo/bar to find the X11 headers, so if +they're not in a system include path, things fail. Since this utility is +only needed at build time, there's no real reason to demand the X +headers be installed for both the build and target machines if cross- +compiling, we can just assume a vaguely ANSI environment instead. + +Tested-by: Niclas Zeising <zeising@daemonic.se> +Reviewed-by: Keith Packard <keithp@keithp.com> +Reviewed-by: Matt Turner <mattst88@gmail.com> +--- + src/util/makekeys.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/util/makekeys.c b/src/util/makekeys.c +index bcb5b7d5..07563315 100644 +--- a/src/util/makekeys.c ++++ b/src/util/makekeys.c +@@ -35,8 +35,10 @@ from The Open Group. + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#include <stdint.h> ++#include <inttypes.h> + +-#include "../Xresinternal.h" ++typedef uint32_t Signature; + + #define KTNUM 4000 + +-- +2.20.1 diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb deleted file mode 100644 index 6141f571c5..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb +++ /dev/null @@ -1,13 +0,0 @@ -require libx11.inc - -SRC_URI += "file://disable_tests.patch \ - file://Fix-hanging-issue-in-_XReply.patch \ - " - -inherit gettext - -do_configure_append () { - sed -i -e "/X11_CFLAGS/d" ${B}/src/util/Makefile -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.8.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.8.bb new file mode 100644 index 0000000000..0d27bc2bce --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11_1.6.8.bb @@ -0,0 +1,7 @@ +require libx11.inc + +SRC_URI += "file://disable_tests.patch" + +inherit gettext + +BBCLASSEXTEND = "native nativesdk" |