[yocto] [meta-cgl][PATCH 08/10] heartbeat: make bootstrap work without checking for libtool command

[Dmitry Eremin-Solenikov]

There is no use for just 'libtool' script, other than deriving
libtoolize from it. Make bootstrap script look for libtoolize directly
and forget about libtool completely.

Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin at mentor.com>
---
 .../heartbeat/heartbeat-bootstrap-libtool.patch    | 52 ++++++++++++++++++++++
 .../recipes-cgl/heartbeat/heartbeat_3.0.5.bb       |  1 +
 2 files changed, 53 insertions(+)
 create mode 100644 meta-cgl-common/recipes-cgl/heartbeat/heartbeat/heartbeat-bootstrap-libtool.patch

diff --git a/meta-cgl-common/recipes-cgl/heartbeat/heartbeat/heartbeat-bootstrap-libtool.patch b/meta-cgl-common/recipes-cgl/heartbeat/heartbeat/heartbeat-bootstrap-libtool.patch
new file mode 100644
index 0000000..bcddab2
--- /dev/null
+++ b/meta-cgl-common/recipes-cgl/heartbeat/heartbeat/heartbeat-bootstrap-libtool.patch
@@ -0,0 +1,52 @@
+Index: Heartbeat-3-0-7e3a82377fa8/bootstrap
+===================================================================
+--- Heartbeat-3-0-7e3a82377fa8.orig/bootstrap
++++ Heartbeat-3-0-7e3a82377fa8/bootstrap
+@@ -173,23 +173,22 @@ ln -s `which $automake` ./automake
+ 
+ # Check for Libtool
+ pkg="libtool"
+-for command in libtool libtool14 libtool15 glibtool
++for command in libtoolize libtoolize14 libtoolize15 glibtoolize
+ do
+   URL=$gnu/$pkg/
+   if
+     testProgram $command
+   then
+     : OK $pkg is installed
+-    libtool=$command
+-    libtoolize=`echo  "$libtool" | sed -e 's/libtool/libtoolize/'`
++    libtoolize=$command
+   fi
+ done
+ 
+ # Check to see if we got a valid command.
+ if 
+-    $libtool --version </dev/null >/dev/null 2>&1
++    $libtoolize --version </dev/null >/dev/null 2>&1
+ then
+-    echo "Libtool package $libtool found."
++    echo "Libtool package $libtoolize found."
+ else
+     RC=$?
+     cat <<-EOF >&2
+@@ -200,10 +199,6 @@ else
+ 	EOF
+ fi
+ 
+-# Create local copy so that the incremental updates will work.
+-rm -f          ./libtool
+-ln -s `which $libtool` ./libtool
+-
+ case $RC in
+   0)	;;
+   *)	exit $RC;;
+@@ -217,7 +212,7 @@ oneline() {
+   read x; echo "$x"
+ }
+ 
+-LT_version=`$libtool --version | oneline | sed -e 's%^[^0-9]*%%' -e s'% .*%%'`
++LT_version=`$libtoolize --version | oneline | sed -e 's%^[^0-9]*%%' -e s'% .*%%'`
+ LT_majvers=`echo "$LT_version" | sed -e 's%\..*%%'`
+ LT_minvers=`echo "$LT_version" | sed -e 's%^[^.]*\.%%' `
+ LT_minnum=`echo  "$LT_minvers" | sed -e 's%[^0-9].*%%'`
diff --git a/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.5.bb b/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.5.bb
index 369bd23..184ad22 100644
--- a/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.5.bb
+++ b/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.5.bb
@@ -34,6 +34,7 @@ SRC_URI = " \
     file://ucast.c-fix-compile-errors.patch \
     file://configure.in-Error-and-warning-fix.patch \
     file://heartbeat-init.d-heartbeat.in-modify-parameter.patch \
+    file://heartbeat-bootstrap-libtool.patch \
     file://heartbeat.service \
 "
 SRC_URI[md5sum] = "396510e3c143a9c2288bc52cfc9caa3c"
-- 
2.1.4