From 8480fff287e660f85a99fcc28119fe80d517e0b2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 30 Jul 2018 17:00:01 +0000 Subject: 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 Signed-off-by: Armin Kuster --- .../libtool/libtool/multilib.patch | 23 ++++++++++++++++++++++ meta/recipes-devtools/libtool/libtool_2.4.6.bb | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 meta/recipes-devtools/libtool/libtool/multilib.patch 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 @@ +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. + +Ugly, but just patch this out. This fixes issues where libtool and +libXX-libtool couldn't be installed into the same system. + +Upstream-Status: Inapproriate +RP 2018/7/30 + +Index: libtool-2.4.6/libtoolize.in +=================================================================== +--- libtool-2.4.6.orig/libtoolize.in ++++ libtool-2.4.6/libtoolize.in +@@ -113,7 +113,7 @@ You must 'cd' to the top directory of yo + When reporting a bug, please describe a test case to reproduce it and + include the following information: + +- host-triplet: @host_triplet@ ++ host-triplet + version: $progname (GNU @PACKAGE@) @VERSION@ + automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` + 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 @@ require libtool-${PV}.inc +SRC_URI += "file://multilib.patch" + RDEPENDS_${PN} += "bash" # -- cgit 1.2.3-korg