summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/readline
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-23 11:11:16 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-24 00:12:01 (GMT)
commit050be51c1d16dee8dcebcffd24baecdfac8bdba8 (patch)
tree719de6095fa1c7a6b3b2ccd07a08074406f4d1f5 /meta/recipes-core/readline
parentbd7f819b1f5ea95ab04ed46b25ca3714bcb30d90 (diff)
downloadpoky-050be51c1d16dee8dcebcffd24baecdfac8bdba8.tar.gz
readline: Add a patch to remove the redundant rpath linker option
This resolves the QA warnings: WARNING: QA Issue: readline: /work/x86_64-poky-linux/readline-6.2-r0/packages-split/readline/usr/lib/libhistory.so.6.2 contains probably-redundant RPATH /usr/lib WARNING: QA Issue: readline: /work/x86_64-poky-linux/readline-6.2-r0/packages-split/readline/usr/lib/libreadline.so.6.2 contains probably-redundant RPATH /usr/lib WARNING: QA Issue: readline: /work/x86_64-poky-linux/readline-6.2-r0/packages-split/readline/usr/lib/libreadline.so.6 contains probably-redundant RPATH /usr/lib WARNING: QA Issue: readline: /work/x86_64-poky-linux/readline-6.2-r0/packages-split/readline/usr/lib/libhistory.so.6 contains probably-redundant RPATH /usr/lib (From OE-Core rev: fe8661cd30b02dd8ea9bf172479f372c919c36a7) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/readline')
-rw-r--r--meta/recipes-core/readline/files/norpath.patch21
-rw-r--r--meta/recipes-core/readline/readline.inc1
-rw-r--r--meta/recipes-core/readline/readline_6.2.bb2
3 files changed, 23 insertions, 1 deletions
diff --git a/meta/recipes-core/readline/files/norpath.patch b/meta/recipes-core/readline/files/norpath.patch
new file mode 100644
index 0000000..5d71582
--- /dev/null
+++ b/meta/recipes-core/readline/files/norpath.patch
@@ -0,0 +1,21 @@
1This support script ends up hardcoding unnecessary rpaths into the libraries. We
2will search $libdir automatically so this is just wastes space. There may be some
3cases this is necessary but our use cases aren't one of them.
4
5Upstream-Status: Inappropriate
6
7RP 2012/2/23
8
9Index: readline-6.2/support/shobj-conf
10===================================================================
11--- readline-6.2.orig/support/shobj-conf 2012-02-23 11:06:37.193179379 +0000
12+++ readline-6.2/support/shobj-conf 2012-02-23 11:06:50.049178918 +0000
13@@ -114,7 +114,7 @@
14 SHOBJ_LD='${CC}'
15 SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
16
17- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
18+ SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
19 SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
20 ;;
21
diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc
index 743d8b3..2e9c6b1 100644
--- a/meta/recipes-core/readline/readline.inc
+++ b/meta/recipes-core/readline/readline.inc
@@ -12,6 +12,7 @@ DEPENDS += "ncurses"
12 12
13SRC_URI = "${GNU_MIRROR}/readline/${BPN}-${PV}.tar.gz \ 13SRC_URI = "${GNU_MIRROR}/readline/${BPN}-${PV}.tar.gz \
14 file://configure-fix.patch \ 14 file://configure-fix.patch \
15 file://norpath.patch \
15 file://acinclude.m4" 16 file://acinclude.m4"
16 17
17S = "${WORKDIR}/${BPN}-${PV}" 18S = "${WORKDIR}/${BPN}-${PV}"
diff --git a/meta/recipes-core/readline/readline_6.2.bb b/meta/recipes-core/readline/readline_6.2.bb
index 5e32bb5..e6f330d 100644
--- a/meta/recipes-core/readline/readline_6.2.bb
+++ b/meta/recipes-core/readline/readline_6.2.bb
@@ -1,6 +1,6 @@
1require readline.inc 1require readline.inc
2 2
3PR = "r0" 3PR = "r1"
4 4
5SRC_URI[md5sum] = "67948acb2ca081f23359d0256e9a271c" 5SRC_URI[md5sum] = "67948acb2ca081f23359d0256e9a271c"
6SRC_URI[sha256sum] = "79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381" 6SRC_URI[sha256sum] = "79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381"