aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/slang/slang/rpathfix.patch
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-07-25 01:16:28 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-25 23:46:56 +0100
commitb2d6e069b9ecc5a13754393200a6fa48cdaaf4c6 (patch)
tree1ee24a8b00ccec7c0142965ffa6db4cac7ed8a7c /meta/recipes-extended/slang/slang/rpathfix.patch
parente011f70741d9c60ab68a0fa2458a5051030efd64 (diff)
downloadopenembedded-core-contrib-b2d6e069b9ecc5a13754393200a6fa48cdaaf4c6.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': 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.patch18
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
===================================================================
--- slang-2.2.4.orig/configure 2012-03-14 23:40:01.283560679 +0000
+++ slang-2.2.4/configure 2012-03-14 23:41:18.023558900 +0000
-@@ -6081,56 +6081,7 @@
+@@ -6246,68 +6246,7 @@ esac
ELF_CFLAGS="$ELF_CFLAGS $IEEE_CFLAGS"
CFLAGS="$CFLAGS $IEEE_CFLAGS"
@@ -39,7 +39,7 @@ Index: slang-2.2.4/configure
- fi
- fi
- ;;
-- *osf*|*openbsd*)
+- *osf*|*openbsd*|*freebsd*)
- if test "X$GCC" = Xyes
- then
- RPATH="-Wl,-rpath,"
@@ -60,7 +60,19 @@ Index: slang-2.2.4/configure
- RPATH="$RPATH$libdir"
- fi
- else
-- RPATH="$RPATH:$libdir"
+- _already_there=0
+- for X in `echo $RPATH | sed 's/:/ /g'`
+- do
+- if test "$X" = "$libdir"
+- then
+- _already_there=1
+- break
+- fi
+- done
+- if test $_already_there = 0
+- then
+- RPATH="$RPATH:$libdir"
+- fi
- fi
-fi
-