diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-30 17:00:01 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-31 22:41:15 +0100 |
| commit | f70040fd3ca3508d33ed24c749c0b8095b020dab (patch) | |
| tree | c369ebf47621f2bc4c470fa080a352ee2de24429 /meta/recipes-devtools/libtool | |
| parent | 18e837433d07cfdce4019c13f682c6676425a2ad (diff) | |
| download | openembedded-core-f70040fd3ca3508d33ed24c749c0b8095b020dab.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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/libtool')
| -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" # |