[oe-commits] Saul Wold : readline: Fix RPATH Warnings for GPLv2

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 511a9e72f7deac4d31bad6c2d94117d9fd0b97f5
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=511a9e72f7deac4d31bad6c2d94117d9fd0b97f5

Author: Saul Wold <sgw at linux.intel.com>
Date:   Wed Mar 21 15:54:34 2012 -0700

readline: Fix RPATH Warnings for GPLv2

the norpath.patch with v2 and it worked correctly?
WARNING: QA Issue: readline: /work/i586-poky-linux/readline-5.2-r7/packages-split/readline/usr/lib/libhistory.so.5.2 contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: readline: /work/i586-poky-linux/readline-5.2-r7/packages-split/readline/usr/lib/libreadline.so.5.2 contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: readline: /work/i586-poky-linux/readline-5.2-r7/packages-split/readline/usr/lib/libreadline.so.5 contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: readline: /work/i586-poky-linux/readline-5.2-r7/packages-split/readline/usr/lib/libhistory.so.5 contains probably-redundant RPATH /usr/lib

Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../fix-redundant-rpath.patch}                     |   10 +++++-----
 .../readline/{files => readline-6.2}/norpath.patch |    0
 meta/recipes-core/readline/readline_5.2.bb         |    5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-core/readline/files/norpath.patch b/meta/recipes-core/readline/readline-5.2/fix-redundant-rpath.patch
similarity index 73%
copy from meta/recipes-core/readline/files/norpath.patch
copy to meta/recipes-core/readline/readline-5.2/fix-redundant-rpath.patch
index 5d71582..3166b47 100644
--- a/meta/recipes-core/readline/files/norpath.patch
+++ b/meta/recipes-core/readline/readline-5.2/fix-redundant-rpath.patch
@@ -4,13 +4,13 @@ cases this is necessary but our use cases aren't one of them.
 
 Upstream-Status: Inappropriate
 
-RP 2012/2/23
+Signed-off-by: Saul Wold <sgw at linux.intel.com>
 
-Index: readline-6.2/support/shobj-conf
+Index: readline-5.2/support/shobj-conf
 ===================================================================
---- readline-6.2.orig/support/shobj-conf	2012-02-23 11:06:37.193179379 +0000
-+++ readline-6.2/support/shobj-conf	2012-02-23 11:06:50.049178918 +0000
-@@ -114,7 +114,7 @@
+--- readline-5.2.orig/support/shobj-conf
++++ readline-5.2/support/shobj-conf
+@@ -110,7 +110,7 @@ linux*-*|gnu*-*|k*bsd*-gnu-*)
  	SHOBJ_LD='${CC}'
  	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
  
diff --git a/meta/recipes-core/readline/files/norpath.patch b/meta/recipes-core/readline/readline-6.2/norpath.patch
similarity index 100%
rename from meta/recipes-core/readline/files/norpath.patch
rename to meta/recipes-core/readline/readline-6.2/norpath.patch
diff --git a/meta/recipes-core/readline/readline_5.2.bb b/meta/recipes-core/readline/readline_5.2.bb
index bf64853..705c526 100644
--- a/meta/recipes-core/readline/readline_5.2.bb
+++ b/meta/recipes-core/readline/readline_5.2.bb
@@ -9,11 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=03b36fdd84f74b8d8189a202b980b67f"
 
 DEPENDS += "ncurses"
 
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "${GNU_MIRROR}/readline/${BPN}-${PV}.tar.gz \
            file://configure-fix.patch \
-           file://acinclude.m4"
+           file://acinclude.m4 \
+           file://fix-redundant-rpath.patch"
 
 SRC_URI[md5sum] = "e39331f32ad14009b9ff49cc10c5e751"
 SRC_URI[sha256sum] = "12e88d96aee2cd1192500356f0535540db499282ca7f76339fb4228c31249f45"