summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-30 17:00:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-31 22:47:35 +0100
commit9fe21b8dd723a0979e37cbed3d5fdf147cc4b241 (patch)
tree66ba6a15bcf97bad2a37ea8c5b3c46dc39a85656 /meta/recipes-devtools
parente3497cc22b969e02efa54e4e54e087dbb91d8ced (diff)
downloadpoky-9fe21b8dd723a0979e37cbed3d5fdf147cc4b241.tar.gz
libtool: Fix problem with libtoolize in multilib installations
Without this patch /usr/bin/libtoolize is different for each multilib since their host-triplets are different, despite there being no difference in the functionality of libtoolize itself. This change just patches out the problematic line since its just a comment for the user in help text. Ugly but solves the problem. This fixes issues where libtool and libXX-libtool couldn't be installed into the same system. (From OE-Core rev: f70040fd3ca3508d33ed24c749c0b8095b020dab) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/libtool/libtool/multilib.patch23
-rw-r--r--meta/recipes-devtools/libtool/libtool_2.4.6.bb2
2 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-devtools/libtool/libtool/multilib.patch b/meta/recipes-devtools/libtool/libtool/multilib.patch
new file mode 100644
index 0000000000..c4794113ef
--- /dev/null
+++ b/meta/recipes-devtools/libtool/libtool/multilib.patch
@@ -0,0 +1,23 @@
1Without this patch /usr/bin/libtoolize is different for each multilib
2since their host-triplets are different, despite there being no difference in
3the functionality of libtoolize itself.
4
5Ugly, but just patch this out. This fixes issues where libtool and
6libXX-libtool couldn't be installed into the same system.
7
8Upstream-Status: Inapproriate
9RP 2018/7/30
10
11Index: libtool-2.4.6/libtoolize.in
12===================================================================
13--- libtool-2.4.6.orig/libtoolize.in
14+++ libtool-2.4.6/libtoolize.in
15@@ -113,7 +113,7 @@ You must 'cd' to the top directory of yo
16 When reporting a bug, please describe a test case to reproduce it and
17 include the following information:
18
19- host-triplet: @host_triplet@
20+ host-triplet <redacted>
21 version: $progname (GNU @PACKAGE@) @VERSION@
22 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
23 autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
diff --git a/meta/recipes-devtools/libtool/libtool_2.4.6.bb b/meta/recipes-devtools/libtool/libtool_2.4.6.bb
index b8a5240885..f5fdd00e5e 100644
--- a/meta/recipes-devtools/libtool/libtool_2.4.6.bb
+++ b/meta/recipes-devtools/libtool/libtool_2.4.6.bb
@@ -1,5 +1,7 @@
1require libtool-${PV}.inc 1require libtool-${PV}.inc
2 2
3SRC_URI += "file://multilib.patch"
4
3RDEPENDS_${PN} += "bash" 5RDEPENDS_${PN} += "bash"
4 6
5# 7#