[oe-commits] [openembedded-core] 02/14: libtool: Fix problem with libtoolize in multilib installations

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit f70040fd3ca3508d33ed24c749c0b8095b020dab
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Mon Jul 30 17:00:01 2018 +0000

    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 at linuxfoundation.org>
---
 .../libtool/libtool/multilib.patch                 | 23 ++++++++++++++++++++++
 meta/recipes-devtools/libtool/libtool_2.4.6.bb     |  2 ++
 2 files changed, 25 insertions(+)

diff --git a/meta/recipes-devtools/libtool/libtool/multilib.patch b/meta/recipes-devtools/libtool/libtool/multilib.patch
new file mode 100644
index 0000000..c479411
--- /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 b8a5240..f5fdd00 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"
 
 #

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.