diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2016-07-25 01:16:28 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-26 08:56:26 +0100 |
commit | 91a6f3a3756219ae91435d60a0ceb8fd36fd056f (patch) | |
tree | 21bdd5c6f6e46fbbbbbcca4e26fe1e01e0e7c037 /meta/recipes-extended/slang/slang/rpathfix.patch | |
parent | 2186bbca70cfcec42b01484126d654bfec987ae0 (diff) | |
download | poky-91a6f3a3756219ae91435d60a0ceb8fd36fd056f.tar.gz |
slang: 2.2.4 -> 2.3.0
* Removed:
change-char-type-to-signed-char-in-macros.patch
sprintf-bug-concerning-8-bit-characters.patch
They are already in the source.
* Updated:
fix-check-pcre.patch
fix-check-pcre.patch
slang-fix-the-iconv-existence-checking.patch
* Use SECURITY_NO_PIE_CFLAGS for SECURITY_CFLAGS, it can't be built with
"-pie -fpie":
tmp/sysroots/qemux86-64/usr/lib64/../lib64/Scrt1.o: In function `_start':
/usr/src/debug/glibc/2.24-r0/git/csu/../sysdeps/x86_64/start.S:104: undefined reference to `main'
/tmp/ccMFTA8A.o: In function `smg_char_at':
/usr/src/debug/slang/2.3.0-r0/slang-2.3.0/modules/slsmg-module.c:134: undefined reference to `SLsmg_char_at'
/tmp/ccMFTA8A.o: In function `smg_resume_smg':
(From OE-Core rev: b2d6e069b9ecc5a13754393200a6fa48cdaaf4c6)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/slang/slang/rpathfix.patch')
-rw-r--r-- | meta/recipes-extended/slang/slang/rpathfix.patch | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/meta/recipes-extended/slang/slang/rpathfix.patch b/meta/recipes-extended/slang/slang/rpathfix.patch index 50cac9264f..f82a5313d5 100644 --- a/meta/recipes-extended/slang/slang/rpathfix.patch +++ b/meta/recipes-extended/slang/slang/rpathfix.patch | |||
@@ -10,7 +10,7 @@ Index: slang-2.2.4/configure | |||
10 | =================================================================== | 10 | =================================================================== |
11 | --- slang-2.2.4.orig/configure 2012-03-14 23:40:01.283560679 +0000 | 11 | --- slang-2.2.4.orig/configure 2012-03-14 23:40:01.283560679 +0000 |
12 | +++ slang-2.2.4/configure 2012-03-14 23:41:18.023558900 +0000 | 12 | +++ slang-2.2.4/configure 2012-03-14 23:41:18.023558900 +0000 |
13 | @@ -6081,56 +6081,7 @@ | 13 | @@ -6246,68 +6246,7 @@ esac |
14 | ELF_CFLAGS="$ELF_CFLAGS $IEEE_CFLAGS" | 14 | ELF_CFLAGS="$ELF_CFLAGS $IEEE_CFLAGS" |
15 | CFLAGS="$CFLAGS $IEEE_CFLAGS" | 15 | CFLAGS="$CFLAGS $IEEE_CFLAGS" |
16 | 16 | ||
@@ -39,7 +39,7 @@ Index: slang-2.2.4/configure | |||
39 | - fi | 39 | - fi |
40 | - fi | 40 | - fi |
41 | - ;; | 41 | - ;; |
42 | - *osf*|*openbsd*) | 42 | - *osf*|*openbsd*|*freebsd*) |
43 | - if test "X$GCC" = Xyes | 43 | - if test "X$GCC" = Xyes |
44 | - then | 44 | - then |
45 | - RPATH="-Wl,-rpath," | 45 | - RPATH="-Wl,-rpath," |
@@ -60,7 +60,19 @@ Index: slang-2.2.4/configure | |||
60 | - RPATH="$RPATH$libdir" | 60 | - RPATH="$RPATH$libdir" |
61 | - fi | 61 | - fi |
62 | - else | 62 | - else |
63 | - RPATH="$RPATH:$libdir" | 63 | - _already_there=0 |
64 | - for X in `echo $RPATH | sed 's/:/ /g'` | ||
65 | - do | ||
66 | - if test "$X" = "$libdir" | ||
67 | - then | ||
68 | - _already_there=1 | ||
69 | - break | ||
70 | - fi | ||
71 | - done | ||
72 | - if test $_already_there = 0 | ||
73 | - then | ||
74 | - RPATH="$RPATH:$libdir" | ||
75 | - fi | ||
64 | - fi | 76 | - fi |
65 | -fi | 77 | -fi |
66 | - | 78 | - |