diff options
Diffstat (limited to 'meta')
-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 @@ | |||
1 | This support script ends up hardcoding unnecessary rpaths into the libraries. We | ||
2 | will search $libdir automatically so this is just wastes space. There may be some | ||
3 | cases this is necessary but our use cases aren't one of them. | ||
4 | |||
5 | Upstream-Status: Inappropriate | ||
6 | |||
7 | RP 2012/2/23 | ||
8 | |||
9 | Index: 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 743d8b3946..2e9c6b1c0d 100644 --- a/meta/recipes-core/readline/readline.inc +++ b/meta/recipes-core/readline/readline.inc | |||
@@ -12,6 +12,7 @@ DEPENDS += "ncurses" | |||
12 | 12 | ||
13 | SRC_URI = "${GNU_MIRROR}/readline/${BPN}-${PV}.tar.gz \ | 13 | SRC_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 | ||
17 | S = "${WORKDIR}/${BPN}-${PV}" | 18 | 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 @@ | |||
1 | require readline.inc | 1 | require readline.inc |
2 | 2 | ||
3 | PR = "r0" | 3 | PR = "r1" |
4 | 4 | ||
5 | SRC_URI[md5sum] = "67948acb2ca081f23359d0256e9a271c" | 5 | SRC_URI[md5sum] = "67948acb2ca081f23359d0256e9a271c" |
6 | SRC_URI[sha256sum] = "79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381" | 6 | SRC_URI[sha256sum] = "79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381" |