diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-30 17:00:01 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-25 22:13:07 +0000 |
commit | 8480fff287e660f85a99fcc28119fe80d517e0b2 (patch) | |
tree | 950c225165f6dc7380d95948903e2dfc0a9ecd9f | |
parent | 97e2d65d1c406bc58fe693e500fcc939459bac1a (diff) | |
download | openembedded-core-contrib-8480fff287e660f85a99fcc28119fe80d517e0b2.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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta/recipes-devtools/libtool/libtool/multilib.patch | 23 | ||||
-rw-r--r-- | meta/recipes-devtools/libtool/libtool_2.4.6.bb | 2 |
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 @@ +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 <redacted> + 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" # |