summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/readline
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-03-21 22:54:34 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-21 23:17:32 (GMT)
commit621e5cd9923a11bb6223b2bcbfb1b77031f708f8 (patch)
tree5edbda79376463cd5685baf7111bb12b169ca85e /meta/recipes-core/readline
parent4cc2b9adf2084105e6798f1374ee0fb48f7eb92a (diff)
downloadpoky-621e5cd9923a11bb6223b2bcbfb1b77031f708f8.tar.gz
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 (From OE-Core rev: 511a9e72f7deac4d31bad6c2d94117d9fd0b97f5) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/readline')
-rw-r--r--meta/recipes-core/readline/readline-5.2/fix-redundant-rpath.patch21
-rw-r--r--meta/recipes-core/readline/readline-6.2/norpath.patch (renamed from meta/recipes-core/readline/files/norpath.patch)0
-rw-r--r--meta/recipes-core/readline/readline_5.2.bb5
3 files changed, 24 insertions, 2 deletions
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 0000000..3166b47
--- /dev/null
+++ b/meta/recipes-core/readline/readline-5.2/fix-redundant-rpath.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
7Signed-off-by: Saul Wold <sgw@linux.intel.com>
8
9Index: readline-5.2/support/shobj-conf
10===================================================================
11--- readline-5.2.orig/support/shobj-conf
12+++ readline-5.2/support/shobj-conf
13@@ -110,7 +110,7 @@ linux*-*|gnu*-*|k*bsd*-gnu-*)
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/files/norpath.patch b/meta/recipes-core/readline/readline-6.2/norpath.patch
index 5d71582..5d71582 100644
--- a/meta/recipes-core/readline/files/norpath.patch
+++ b/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"
9 9
10DEPENDS += "ncurses" 10DEPENDS += "ncurses"
11 11
12PR = "r7" 12PR = "r8"
13 13
14SRC_URI = "${GNU_MIRROR}/readline/${BPN}-${PV}.tar.gz \ 14SRC_URI = "${GNU_MIRROR}/readline/${BPN}-${PV}.tar.gz \
15 file://configure-fix.patch \ 15 file://configure-fix.patch \
16 file://acinclude.m4" 16 file://acinclude.m4 \
17 file://fix-redundant-rpath.patch"
17 18
18SRC_URI[md5sum] = "e39331f32ad14009b9ff49cc10c5e751" 19SRC_URI[md5sum] = "e39331f32ad14009b9ff49cc10c5e751"
19SRC_URI[sha256sum] = "12e88d96aee2cd1192500356f0535540db499282ca7f76339fb4228c31249f45" 20SRC_URI[sha256sum] = "12e88d96aee2cd1192500356f0535540db499282ca7f76339fb4228c31249f45"