summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch33
-rw-r--r--meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb4
2 files changed, 36 insertions, 1 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch b/meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch
new file mode 100644
index 0000000000..1a691a3d5e
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch
@@ -0,0 +1,33 @@
1From b0c0e6d90bd99a699701c9542640adb218f5d536 Mon Sep 17 00:00:00 2001
2From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
3Date: Mon, 10 Jul 2017 16:51:13 +0300
4Subject: [PATCH] libXt: util: don't link makestrs with target cflags
5
6The line: AM_CFLAGS = $(XT_CFLAGS)
7in util/Makefile.am is wrong because it adds target cflags to the
8compilation of makestrs, which is built for the build machine, which
9leads to build failures when cross-compiling.
10
11Upstream-Status: Pending
12
13Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
14Signed-off-by: Maxin B. John <maxin.john@intel.com>
15---
16 util/Makefile.am | 1 -
17 1 file changed, 1 deletion(-)
18
19diff --git a/util/Makefile.am b/util/Makefile.am
20index 800b35b..f2dd1f9 100644
21--- a/util/Makefile.am
22+++ b/util/Makefile.am
23@@ -11,7 +11,6 @@ EXTRA_DIST = \
24 StrDefs.ht \
25 string.list
26
27-AM_CFLAGS = $(XT_CFLAGS)
28 makestrs_SOURCES = makestrs.c
29
30
31--
322.4.0
33
diff --git a/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb b/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb
index c1ed0bb314..180d00d9b0 100644
--- a/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb
+++ b/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb
@@ -23,7 +23,9 @@ PE = "1"
23 23
24XORG_PN = "libXt" 24XORG_PN = "libXt"
25 25
26SRC_URI += "file://libxt_fix_for_x32.patch" 26SRC_URI += "file://libxt_fix_for_x32.patch \
27 file://0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch \
28 "
27 29
28BBCLASSEXTEND = "native" 30BBCLASSEXTEND = "native"
29 31