| Message ID | 20190802203719.20437-9-ross.burton@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/9] libxx86misc: remove this now redundant library | expand |
On Fri, Aug 2, 2019 at 1:52 PM Ross Burton <ross.burton@intel.com> wrote: > 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. > Aren’t we deleting libx11-diet then we might not want to accommodate for it > > Signed-off-by: Ross Burton <ross.burton@intel.com> > --- > ...x11-diet_1.6.7.bb => libx11-diet_1.6.8.bb} | 0 > meta/recipes-graphics/xorg-lib/libx11.inc | 8 +++- > .../xorg-lib/libx11/fix-libtool.patch | 35 ++++++++++++++++ > .../xorg-lib/libx11/no-host-x.patch | 40 +++++++++++++++++++ > .../recipes-graphics/xorg-lib/libx11_1.6.7.bb | 13 ------ > .../recipes-graphics/xorg-lib/libx11_1.6.8.bb | 7 ++++ > 6 files changed, 88 insertions(+), 15 deletions(-) > rename meta/recipes-graphics/xorg-lib/{libx11-diet_1.6.7.bb => > libx11-diet_1.6.8.bb} (100%) > create mode 100644 meta/recipes-graphics/xorg-lib/libx11/fix-libtool.patch > create mode 100644 meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch > delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb > create mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.6.8.bb > > 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 > similarity index 100% > rename from meta/recipes-graphics/xorg-lib/libx11-diet_1.6.7.bb > rename to 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 ea2ebfb8b95..994c33a8efc 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 00000000000..678b7aff445 > --- /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 00000000000..803f8b408cb > --- /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 6141f571c5a..00000000000 > --- 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 00000000000..0d27bc2bce9 > --- /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" > -- > 2.20.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > <div><br></div><div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Aug 2, 2019 at 1:52 PM Ross Burton <<a href="mailto:ross.burton@intel.com">ross.burton@intel.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Fix the build when the host doesn't have libc.a installed by reverting an<br> upstream commit, and cherry-pick a build fix from master.<br> <br> Drop a redundant sed, the expression it removes doesn't exist anymore.<br> <br> Move most patches to libx11.inc so that they're applied to both libx11 and libx11-diet.<br> </blockquote><div dir="auto"><br></div><div dir="auto">Aren’t we deleting libx11-diet then we might not want to accommodate for it </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br> Signed-off-by: Ross Burton <<a href="mailto:ross.burton@intel.com" target="_blank">ross.burton@intel.com</a>><br> ---<br> ...<a href="http://x11-diet_1.6.7.bb" rel="noreferrer" target="_blank">x11-diet_1.6.7.bb</a> => <a href="http://libx11-diet_1.6.8.bb" rel="noreferrer" target="_blank">libx11-diet_1.6.8.bb</a>} | 0<br> meta/recipes-graphics/xorg-lib/libx11.inc | 8 +++-<br> .../xorg-lib/libx11/fix-libtool.patch | 35 ++++++++++++++++<br> .../xorg-lib/libx11/no-host-x.patch | 40 +++++++++++++++++++<br> .../recipes-graphics/xorg-lib/<a href="http://libx11_1.6.7.bb" rel="noreferrer" target="_blank">libx11_1.6.7.bb</a> | 13 ------<br> .../recipes-graphics/xorg-lib/<a href="http://libx11_1.6.8.bb" rel="noreferrer" target="_blank">libx11_1.6.8.bb</a> | 7 ++++<br> 6 files changed, 88 insertions(+), 15 deletions(-)<br> rename meta/recipes-graphics/xorg-lib/{<a href="http://libx11-diet_1.6.7.bb" rel="noreferrer" target="_blank">libx11-diet_1.6.7.bb</a> => <a href="http://libx11-diet_1.6.8.bb" rel="noreferrer" target="_blank">libx11-diet_1.6.8.bb</a>} (100%)<br> create mode 100644 meta/recipes-graphics/xorg-lib/libx11/fix-libtool.patch<br> create mode 100644 meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch<br> delete mode 100644 meta/recipes-graphics/xorg-lib/<a href="http://libx11_1.6.7.bb" rel="noreferrer" target="_blank">libx11_1.6.7.bb</a><br> create mode 100644 meta/recipes-graphics/xorg-lib/<a href="http://libx11_1.6.8.bb" rel="noreferrer" target="_blank">libx11_1.6.8.bb</a><br> <br> diff --git a/meta/recipes-graphics/xorg-lib/<a href="http://libx11-diet_1.6.7.bb" rel="noreferrer" target="_blank">libx11-diet_1.6.7.bb</a> b/meta/recipes-graphics/xorg-lib/<a href="http://libx11-diet_1.6.8.bb" rel="noreferrer" target="_blank">libx11-diet_1.6.8.bb</a><br> similarity index 100%<br> rename from meta/recipes-graphics/xorg-lib/<a href="http://libx11-diet_1.6.7.bb" rel="noreferrer" target="_blank">libx11-diet_1.6.7.bb</a><br> rename to meta/recipes-graphics/xorg-lib/<a href="http://libx11-diet_1.6.8.bb" rel="noreferrer" target="_blank">libx11-diet_1.6.8.bb</a><br> diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc<br> index ea2ebfb8b95..994c33a8efc 100644<br> --- a/meta/recipes-graphics/xorg-lib/libx11.inc<br> +++ b/meta/recipes-graphics/xorg-lib/libx11.inc<br> @@ -10,8 +10,12 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:"<br> <br> PE = "1"<br> <br> -SRC_URI[md5sum] = "034fdd6cc5393974d88aec6f5bc96162"<br> -SRC_URI[sha256sum] = "910e9e30efba4ad3672ca277741c2728aebffa7bc526f04dcfa74df2e52a1348"<br> +SRC_URI += "file://Fix-hanging-issue-in-_XReply.patch \<br> + file://fix-libtool.patch \<br> + file://no-host-x.patch"<br> +<br> +SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f"<br> +SRC_URI[sha256sum] = "b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5"<br> <br> PROVIDES = "virtual/libx11"<br> <br> diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-libtool.patch b/meta/recipes-graphics/xorg-lib/libx11/fix-libtool.patch<br> new file mode 100644<br> index 00000000000..678b7aff445<br> --- /dev/null<br> +++ b/meta/recipes-graphics/xorg-lib/libx11/fix-libtool.patch<br> @@ -0,0 +1,35 @@<br> +Passing -all-static to libtool is done to avoid libtool wrappers on Windows, but<br> +it means that the build host needs to have libc.a installed. This isn't the<br> +case for a lot of distributions out of the box, so revert this commit.<br> +<br> +Filed a bug upstream to get a proper fix: <a href="https://gitlab.freedesktop.org/xorg/lib/libx11/issues/100" rel="noreferrer" target="_blank">https://gitlab.freedesktop.org/xorg/lib/libx11/issues/100</a><br> +<br> +Upstream-Status: Inappropriate<br> +Signed-off-by: Ross Burton <<a href="mailto:ross.burton@intel.com" target="_blank">ross.burton@intel.com</a>><br> +<br> +From b9f74dc5e714115057a5a1789b4de202d6f58547 Mon Sep 17 00:00:00 2001<br> +From: Ross Burton <<a href="mailto:ross.burton@intel.com" target="_blank">ross.burton@intel.com</a>><br> +Date: Fri, 2 Aug 2019 00:39:39 +0100<br> +Subject: [PATCH 2/2] Revert "Avoid using libtool wrapper for makekeys"<br> +<br> +This reverts commit 4645e219133458781e3fb48eaea6a74cccb1b9aa.<br> +---<br> + src/util/Makefile.am | 2 +-<br> + 1 file changed, 1 insertion(+), 1 deletion(-)<br> +<br> +diff --git a/src/util/Makefile.am b/src/util/Makefile.am<br> +index 37314370..a051567a 100644<br> +--- a/src/util/Makefile.am<br> ++++ b/src/util/Makefile.am<br> +@@ -10,7 +10,7 @@ AM_CPPFLAGS = \<br> + CC = @CC_FOR_BUILD@<br> + CPPFLAGS = @CPPFLAGS_FOR_BUILD@<br> + CFLAGS = @CFLAGS_FOR_BUILD@<br> +-LDFLAGS = @LDFLAGS_FOR_BUILD@ -all-static<br> ++LDFLAGS = @LDFLAGS_FOR_BUILD@<br> + LIBS =<br> + EXEEXT = @EXEEXT_FOR_BUILD@<br> + <br> +-- <br> +2.20.1<br> +<br> diff --git a/meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch b/meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch<br> new file mode 100644<br> index 00000000000..803f8b408cb<br> --- /dev/null<br> +++ b/meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch<br> @@ -0,0 +1,40 @@<br> +Upstream-Status: Backport<br> +Signed-off-by: Ross Burton <<a href="mailto:ross.burton@intel.com" target="_blank">ross.burton@intel.com</a>><br> +<br> +From cf2ef27831173c5ed6f98be3c39caff18fd4e7f1 Mon Sep 17 00:00:00 2001<br> +From: Adam Jackson <<a href="mailto:ajax@redhat.com" target="_blank">ajax@redhat.com</a>><br> +Date: Mon, 17 Jun 2019 13:36:08 -0400<br> +Subject: [PATCH 1/2] makekeys: Detach ourselves from X headers entirely<br> +<br> +Subsequent to a121b7b0c210efe10bf93453b29050282324c906 we are no longer<br> +building makekeys with enough -I/foo/bar to find the X11 headers, so if<br> +they're not in a system include path, things fail. Since this utility is<br> +only needed at build time, there's no real reason to demand the X<br> +headers be installed for both the build and target machines if cross-<br> +compiling, we can just assume a vaguely ANSI environment instead.<br> +<br> +Tested-by: Niclas Zeising <<a href="mailto:zeising@daemonic.se" target="_blank">zeising@daemonic.se</a>><br> +Reviewed-by: Keith Packard <<a href="mailto:keithp@keithp.com" target="_blank">keithp@keithp.com</a>><br> +Reviewed-by: Matt Turner <<a href="mailto:mattst88@gmail.com" target="_blank">mattst88@gmail.com</a>><br> +---<br> + src/util/makekeys.c | 4 +++-<br> + 1 file changed, 3 insertions(+), 1 deletion(-)<br> +<br> +diff --git a/src/util/makekeys.c b/src/util/makekeys.c<br> +index bcb5b7d5..07563315 100644<br> +--- a/src/util/makekeys.c<br> ++++ b/src/util/makekeys.c<br> +@@ -35,8 +35,10 @@ from The Open Group.<br> + #include <stdio.h><br> + #include <stdlib.h><br> + #include <string.h><br> ++#include <stdint.h><br> ++#include <inttypes.h><br> + <br> +-#include "../Xresinternal.h"<br> ++typedef uint32_t Signature;<br> + <br> + #define KTNUM 4000<br> + <br> +-- <br> +2.20.1<br> diff --git a/meta/recipes-graphics/xorg-lib/<a href="http://libx11_1.6.7.bb" rel="noreferrer" target="_blank">libx11_1.6.7.bb</a> b/meta/recipes-graphics/xorg-lib/<a href="http://libx11_1.6.7.bb" rel="noreferrer" target="_blank">libx11_1.6.7.bb</a><br> deleted file mode 100644<br> index 6141f571c5a..00000000000<br> --- a/meta/recipes-graphics/xorg-lib/<a href="http://libx11_1.6.7.bb" rel="noreferrer" target="_blank">libx11_1.6.7.bb</a><br> +++ /dev/null<br> @@ -1,13 +0,0 @@<br> -require libx11.inc<br> -<br> -SRC_URI += "file://disable_tests.patch \<br> - file://Fix-hanging-issue-in-_XReply.patch \<br> - "<br> -<br> -inherit gettext<br> -<br> -do_configure_append () {<br> - sed -i -e "/X11_CFLAGS/d" ${B}/src/util/Makefile<br> -}<br> -<br> -BBCLASSEXTEND = "native nativesdk"<br> diff --git a/meta/recipes-graphics/xorg-lib/<a href="http://libx11_1.6.8.bb" rel="noreferrer" target="_blank">libx11_1.6.8.bb</a> b/meta/recipes-graphics/xorg-lib/<a href="http://libx11_1.6.8.bb" rel="noreferrer" target="_blank">libx11_1.6.8.bb</a><br> new file mode 100644<br> index 00000000000..0d27bc2bce9<br> --- /dev/null<br> +++ b/meta/recipes-graphics/xorg-lib/<a href="http://libx11_1.6.8.bb" rel="noreferrer" target="_blank">libx11_1.6.8.bb</a><br> @@ -0,0 +1,7 @@<br> +require libx11.inc<br> +<br> +SRC_URI += "file://disable_tests.patch"<br> +<br> +inherit gettext<br> +<br> +BBCLASSEXTEND = "native nativesdk"<br> -- <br> 2.20.1<br> <br> -- <br> _______________________________________________<br> Openembedded-core mailing list<br> <a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br> <a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br> </blockquote></div></div> -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
On 03/08/2019 13:30, Khem Raj wrote: > Move most patches to libx11.inc so that they're applied to both > libx11 and libx11-diet. > > Aren’t we deleting libx11-diet then we might not want to accommodate for it Potentially. This way even if we do remove it, someone can recover libx11-diet 1.6.8 from git. Ross
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 similarity index 100% rename from meta/recipes-graphics/xorg-lib/libx11-diet_1.6.7.bb rename to 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 ea2ebfb8b95..994c33a8efc 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 00000000000..678b7aff445 --- /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 00000000000..803f8b408cb --- /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 6141f571c5a..00000000000 --- 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 00000000000..0d27bc2bce9 --- /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"
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> --- ...x11-diet_1.6.7.bb => libx11-diet_1.6.8.bb} | 0 meta/recipes-graphics/xorg-lib/libx11.inc | 8 +++- .../xorg-lib/libx11/fix-libtool.patch | 35 ++++++++++++++++ .../xorg-lib/libx11/no-host-x.patch | 40 +++++++++++++++++++ .../recipes-graphics/xorg-lib/libx11_1.6.7.bb | 13 ------ .../recipes-graphics/xorg-lib/libx11_1.6.8.bb | 7 ++++ 6 files changed, 88 insertions(+), 15 deletions(-) rename meta/recipes-graphics/xorg-lib/{libx11-diet_1.6.7.bb => libx11-diet_1.6.8.bb} (100%) create mode 100644 meta/recipes-graphics/xorg-lib/libx11/fix-libtool.patch create mode 100644 meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb create mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.6.8.bb -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core