From 511a9e72f7deac4d31bad6c2d94117d9fd0b97f5 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Wed, 21 Mar 2012 15:54:34 -0700 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-core/readline/files/norpath.patch | 21 --------------------- .../readline/readline-5.2/fix-redundant-rpath.patch | 21 +++++++++++++++++++++ .../readline/readline-6.2/norpath.patch | 21 +++++++++++++++++++++ meta/recipes-core/readline/readline_5.2.bb | 5 +++-- 4 files changed, 45 insertions(+), 23 deletions(-) delete mode 100644 meta/recipes-core/readline/files/norpath.patch create mode 100644 meta/recipes-core/readline/readline-5.2/fix-redundant-rpath.patch create mode 100644 meta/recipes-core/readline/readline-6.2/norpath.patch (limited to 'meta/recipes-core/readline') diff --git a/meta/recipes-core/readline/files/norpath.patch b/meta/recipes-core/readline/files/norpath.patch deleted file mode 100644 index 5d71582b70..0000000000 --- a/meta/recipes-core/readline/files/norpath.patch +++ /dev/null @@ -1,21 +0,0 @@ -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-5.2/fix-redundant-rpath.patch b/meta/recipes-core/readline/readline-5.2/fix-redundant-rpath.patch new file mode 100644 index 0000000000..3166b470f2 --- /dev/null +++ b/meta/recipes-core/readline/readline-5.2/fix-redundant-rpath.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 + +Signed-off-by: Saul Wold + +Index: readline-5.2/support/shobj-conf +=================================================================== +--- 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,$@' + +- 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-6.2/norpath.patch b/meta/recipes-core/readline/readline-6.2/norpath.patch new file mode 100644 index 0000000000..5d71582b70 --- /dev/null +++ b/meta/recipes-core/readline/readline-6.2/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_5.2.bb b/meta/recipes-core/readline/readline_5.2.bb index bf64853484..705c526d04 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" -- cgit 1.2.3-korg