summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-app
diff options
context:
space:
mode:
authorJeremy Puhlman <jpuhlman@mvista.com>2020-03-07 05:51:05 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-08 08:21:11 +0000
commita41a9ad3134b9f3391ad79ad7e2c14a8bf3bcc0f (patch)
tree172fcf3b764be465a2a3b9d71fc668d367ce391b /meta/recipes-graphics/xorg-app
parent326e8c68247cf837c1eb18f59d3b2ea495d2c42a (diff)
downloadpoky-a41a9ad3134b9f3391ad79ad7e2c14a8bf3bcc0f.tar.gz
xinit: make manpages multilib identical
(From OE-Core rev: 282ca525c411e03391520c0c5950ed3418f6bc2e) Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-app')
-rw-r--r--meta/recipes-graphics/xorg-app/xinit/0001-Make-manpage-multilib-identical.patch28
-rw-r--r--meta/recipes-graphics/xorg-app/xinit_1.4.1.bb2
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-app/xinit/0001-Make-manpage-multilib-identical.patch b/meta/recipes-graphics/xorg-app/xinit/0001-Make-manpage-multilib-identical.patch
new file mode 100644
index 0000000000..649905574c
--- /dev/null
+++ b/meta/recipes-graphics/xorg-app/xinit/0001-Make-manpage-multilib-identical.patch
@@ -0,0 +1,28 @@
1From d642e60d8963f1b90569cd0ab5c29ac2c9bfe939 Mon Sep 17 00:00:00 2001
2From: Jeremy Puhlman <jpuhlman@mvista.com>
3Date: Fri, 6 Mar 2020 22:28:14 +0000
4Subject: [PATCH] Make manpage multilib identical
5
6Upstream-Status: Submitted
7
8Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
9---
10 man/Makefile.am | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/man/Makefile.am b/man/Makefile.am
14index 9c6569f..608e933 100644
15--- a/man/Makefile.am
16+++ b/man/Makefile.am
17@@ -12,7 +12,7 @@ MAN_SUBSTS+= -e 's|__XSERVERNAME__|$(XSERVERNAME)|g' \
18 -e 's|__XCONFIGFILEMAN__|$(XCONFIGFILEMAN)|g' \
19 -e 's|__xinitdir__|$(XINITDIR)|g' \
20 -e 's|__bindir__|$(bindir)|g' \
21- -e 's|__libdir__|$(libdir)|g' \
22+ -e 's|__libdir__|$(prefix)/lib*|g' \
23 -e 's|__configdir__|$(XINITDIR)|g'
24
25
26--
272.23.0
28
diff --git a/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb b/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb
index 5626ebbd52..c9e28d9bba 100644
--- a/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb
+++ b/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb
@@ -12,6 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18f01e7b39807bebe2b8df101a039b68"
12 12
13PE = "1" 13PE = "1"
14 14
15SRC_URI += "file://0001-Make-manpage-multilib-identical.patch"
16
15SRC_URI[md5sum] = "6d506ab2efc17a08e87778654e099d37" 17SRC_URI[md5sum] = "6d506ab2efc17a08e87778654e099d37"
16SRC_URI[sha256sum] = "de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9" 18SRC_URI[sha256sum] = "de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9"
17 19