diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-23 11:11:16 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-24 00:10:19 +0000 |
| commit | fe8661cd30b02dd8ea9bf172479f372c919c36a7 (patch) | |
| tree | 5822dd6614bbb019827e669d028728b5fe0bf873 | |
| parent | 019747e5fe834092731cdb2987d9c6e1f7fd1cc1 (diff) | |
| download | openembedded-core-fe8661cd30b02dd8ea9bf172479f372c919c36a7.tar.gz openembedded-core-fe8661cd30b02dd8ea9bf172479f372c919c36a7.tar.bz2 openembedded-core-fe8661cd30b02dd8ea9bf172479f372c919c36a7.zip | |
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
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/readline/files/norpath.patch | 21 | ||||
| -rw-r--r-- | meta/recipes-core/readline/readline.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-core/readline/readline_6.2.bb | 2 |
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 0000000000..5d71582b70 --- /dev/null +++ b/meta/recipes-core/readline/files/norpath.patch @@ -0,0 +1,21 @@ +This support script ends up hardcoding unnecessary rpaths into the libraries. We +will search $libdir automatically so this is just wastes space. There may be some +cases this is necessary but our use cases aren't one of them. + +Upstream-Status: Inappropriate + +RP 2012/2/23 + +Index: readline-6.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 @@ + SHOBJ_LD='${CC}' + SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' + +- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`' ++ SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`' + SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' + ;; + diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc index 743d8b3946..2e9c6b1c0d 100644 --- a/meta/recipes-core/readline/readline.inc +++ b/meta/recipes-core/readline/readline.inc @@ -12,6 +12,7 @@ DEPENDS += "ncurses" SRC_URI = "${GNU_MIRROR}/readline/${BPN}-${PV}.tar.gz \ file://configure-fix.patch \ + file://norpath.patch \ file://acinclude.m4" S = "${WORKDIR}/${BPN}-${PV}" diff --git a/meta/recipes-core/readline/readline_6.2.bb b/meta/recipes-core/readline/readline_6.2.bb index 5e32bb5d4e..e6f330d0d1 100644 --- a/meta/recipes-core/readline/readline_6.2.bb +++ b/meta/recipes-core/readline/readline_6.2.bb @@ -1,6 +1,6 @@ require readline.inc -PR = "r0" +PR = "r1" SRC_URI[md5sum] = "67948acb2ca081f23359d0256e9a271c" SRC_URI[sha256sum] = "79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381" |