[oe] [meta-oe][PATCH V3 1/4] rrdtool: fix useless-rpath QA issue

[Chen Qi]

When building rrdtool, we would meet the following error.

  ERROR: QA Issue: rrdtool-python: work/core2-64-poky-linux/rrdtool
  /1.5.4-r0/packages-split/rrdtool-python/usr/lib/python2.7/site-packages
  /rrdtool.so contains probably-redundant RPATH /usr/lib [useless-rpaths]

Fix this issue by removing 'LD_RUN_PATH=$(libdir)' when compiling rrdtool.so.

As we use '--disable-rpath' in EXTRA_OECONF, we don't need to the to remove
'--rpath=$(libdir)' in Makefile.am.

Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
---
 ...1-bindings-Makefile.am-remove-LD_RUN_PATH.patch | 24 ++++++++++++++++++++++
 meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb  |  3 +--
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-extended/rrdtool/files/0001-bindings-Makefile.am-remove-LD_RUN_PATH.patch

diff --git a/meta-oe/recipes-extended/rrdtool/files/0001-bindings-Makefile.am-remove-LD_RUN_PATH.patch b/meta-oe/recipes-extended/rrdtool/files/0001-bindings-Makefile.am-remove-LD_RUN_PATH.patch
new file mode 100644
index 0000000..539caa5
--- /dev/null
+++ b/meta-oe/recipes-extended/rrdtool/files/0001-bindings-Makefile.am-remove-LD_RUN_PATH.patch
@@ -0,0 +1,24 @@
+Upstream-Status: Inappropriate [OE specific]
+
+Subject: bindings/Makefile.am: remove LD_RUN_PATH
+
+Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
+---
+ bindings/Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/bindings/Makefile.am b/bindings/Makefile.am
+index 54f5c23..8ea16b7 100644
+--- a/bindings/Makefile.am
++++ b/bindings/Makefile.am
+@@ -67,7 +67,6 @@ python:
+           && env \
+                ABS_TOP_SRCDIR=${abs_top_srcdir} \
+                ABS_TOP_BUILDDIR=${abs_top_builddir} \
+-               LD_RUN_PATH=$(libdir) \
+                $(PYTHON) ${abs_srcdir}/$@/setup.py build_ext $(PYTHON_RPATH) \
+           && env \
+                ABS_TOP_SRCDIR=${abs_top_srcdir} \
+-- 
+1.9.1
+
diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb
index 91a30cf..2cf2dab 100644
--- a/meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb
+++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb
@@ -11,6 +11,7 @@ PV = "1.5.4"
 
 SRC_URI = "\
     git://github.com/oetiker/rrdtool-1.x.git;branch=1.5 \
+    file://0001-bindings-Makefile.am-remove-LD_RUN_PATH.patch \
 "
 
 S = "${WORKDIR}/git"
@@ -70,8 +71,6 @@ do_configure() {
     sed -i -e '/PYTHON_INCLUDES="-I${/c \
     PYTHON_INCLUDES="-I=/usr/include/python${PYTHON_BASEVERSION}"' \
         ${S}/m4/acinclude.m4
-    #remove the hardcoded $(libdir) rpath
-    sed -i -e 's|--rpath=$(libdir)||g' ${S}/bindings/Makefile.am
 
     autotools_do_configure
 
-- 
1.9.1