diff options
author | Petter Mabäcker <petter@technux.se> | 2015-11-18 09:53:06 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-01 21:32:10 +0000 |
commit | 99b9d52ce4bb3be88aa8029225ca05dad215ed0b (patch) | |
tree | 97898f4afe3d0cea4e7053198cac36961395943a /meta/recipes-core/readline/readline-6.3 | |
parent | e0b6d0c1d6b7c5724a1848d147b0ad261598808e (diff) | |
download | poky-99b9d52ce4bb3be88aa8029225ca05dad215ed0b.tar.gz |
readline: prepare for readline6.3 upstream patches
Upstream patches are always preferred to be applied first (before
integration patches). In order to apply readline-6.3 specific upstream
patches in a preferred order we need to apply the integration-patches
at the end in the 6.3 specific recipe (this is already the case
for readline-5.2).
Also take the oppertunity to move 'norpath.patch' to readline-6.3 dir
since this patch is not shared between the 5.2 and 6.3 recipe.
[YOCTO #8451]
(From OE-Core rev: d454d1c06247b658c6b7d12de610eb6ac72cd7d4)
Signed-off-by: Petter Mabäcker <petter@technux.se>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/readline/readline-6.3')
-rw-r--r-- | meta/recipes-core/readline/readline-6.3/norpath.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/meta/recipes-core/readline/readline-6.3/norpath.patch b/meta/recipes-core/readline/readline-6.3/norpath.patch new file mode 100644 index 0000000000..5d71582b70 --- /dev/null +++ b/meta/recipes-core/readline/readline-6.3/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 | |||