aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/slang
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-14 23:57:22 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-15 00:07:43 +0000
commitb055075ba5b9ff5250bc66be1cd8b222bdb86161 (patch)
tree93fc2f7634f747735044e6f71367139c622164f1 /meta/recipes-extended/slang
parent34f3127bac9e5a15c33d21a6a6ac83c6060dcac9 (diff)
downloadopenembedded-core-contrib-b055075ba5b9ff5250bc66be1cd8b222bdb86161.tar.gz
slang: Fix rpath QA warnings
WARNING: QA Issue: slang: /work/i586-poky-linux/slang-2.2.4-r6/packages-split/slang/usr/bin/slsh contains probably-redundant RPATH /usr/lib WARNING: QA Issue: slang: /work/i586-poky-linux/slang-2.2.4-r6/packages-split/slang/usr/lib/slang/v2/modules/csv-module.so contains probably-redundant RPATH /usr/lib WARNING: QA Issue: slang: /work/i586-poky-linux/slang-2.2.4-r6/packages-split/slang/usr/lib/slang/v2/modules/rand-module.so contains probably-redundant RPATH /usr/lib WARNING: QA Issue: slang: /work/i586-poky-linux/slang-2.2.4-r6/packages-split/slang/usr/lib/slang/v2/modules/iconv-module.so contains probably-redundant RPATH /usr/lib WARNING: QA Issue: slang: /work/i586-poky-linux/slang-2.2.4-r6/packages-split/slang/usr/lib/slang/v2/modules/select-module.so contains probably-redundant RPATH /usr/lib WARNING: QA Issue: slang: /work/i586-poky-linux/slang-2.2.4-r6/packages-split/slang/usr/lib/slang/v2/modules/varray-module.so contains probably-redundant RPATH /usr/lib WARNING: QA Issue: slang: /work/i586-poky-linux/slang-2.2.4-r6/packages-split/slang/usr/lib/slang/v2/modules/fcntl-module.so contains probably-redundant RPATH /usr/lib WARNING: QA Issue: slang: /work/i586-poky-linux/slang-2.2.4-r6/packages-split/slang/usr/lib/slang/v2/modules/sysconf-module.so contains probably-redundant RPATH /usr/lib WARNING: QA Issue: slang: /work/i586-poky-linux/slang-2.2.4-r6/packages-split/slang/usr/lib/slang/v2/modules/socket-module.so contains probably-redundant RPATH /usr/lib WARNING: QA Issue: slang: /work/i586-poky-linux/slang-2.2.4-r6/packages-split/slang/usr/lib/slang/v2/modules/termios-module.so contains probably-redundant RPATH /usr/lib WARNING: QA Issue: slang: /work/i586-poky-linux/slang-2.2.4-r6/packages-split/slang/usr/lib/slang/v2/modules/slsmg-module.so contains probably-redundant RPATH /usr/lib WARNING: QA Issue: slang: /work/i586-poky-linux/slang-2.2.4-r6/packages-split/slang/usr/lib/slang/v2/modules/fork-module.so contains probably-redundant RPATH /usr/lib Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/slang')
-rw-r--r--meta/recipes-extended/slang/slang/rpathfix.patch70
-rw-r--r--meta/recipes-extended/slang/slang_2.2.4.bb3
2 files changed, 72 insertions, 1 deletions
diff --git a/meta/recipes-extended/slang/slang/rpathfix.patch b/meta/recipes-extended/slang/slang/rpathfix.patch
new file mode 100644
index 0000000000..bd55c392c4
--- /dev/null
+++ b/meta/recipes-extended/slang/slang/rpathfix.patch
@@ -0,0 +1,70 @@
+Without this patch we see rpaths hardcoded into the build which results in QA
+warnings. These rpaths are not needed so lets turn this off.
+
+Upsteam-Status: Inappropriate
+(but could be turned into a proper configure option)
+
+RP 2012/03/14
+
+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 @@
+ ELF_CFLAGS="$ELF_CFLAGS $IEEE_CFLAGS"
+ CFLAGS="$CFLAGS $IEEE_CFLAGS"
+
+-
+-if test "X$libdir" != "X"
+-then
+- if test "X$RPATH" = "X"
+- then
+-
+-case "$host_os" in
+- *linux*|*solaris* )
+- if test "X$GCC" = Xyes
+- then
+- if test "X$ac_R_nospace" = "Xno"
+- then
+- RPATH="-Wl,-R,"
+- else
+- RPATH="-Wl,-R"
+- fi
+- else
+- if test "X$ac_R_nospace" = "Xno"
+- then
+- RPATH="-R "
+- else
+- RPATH="-R"
+- fi
+- fi
+- ;;
+- *osf*|*openbsd*)
+- if test "X$GCC" = Xyes
+- then
+- RPATH="-Wl,-rpath,"
+- else
+- RPATH="-rpath "
+- fi
+- ;;
+- *netbsd*)
+- if test "X$GCC" = Xyes
+- then
+- RPATH="-Wl,-R"
+- fi
+- ;;
+-esac
+-
+- if test "X$RPATH" != "X"
+- then
+- RPATH="$RPATH$libdir"
+- fi
+- else
+- RPATH="$RPATH:$libdir"
+- fi
+-fi
+-
++RPATH=""
+
+ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
diff --git a/meta/recipes-extended/slang/slang_2.2.4.bb b/meta/recipes-extended/slang/slang_2.2.4.bb
index 77e63da7e4..40f671ec1a 100644
--- a/meta/recipes-extended/slang/slang_2.2.4.bb
+++ b/meta/recipes-extended/slang/slang_2.2.4.bb
@@ -10,13 +10,14 @@ to recode S-Lang procedures in C if you need to."
HOMEPAGE = "http://www.jedsoft.org/slang/"
SECTION = "libs"
DEPENDS = "pcre"
-PR = "r6"
+PR = "r7"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=a52a18a472d4f7e45479b06563717c02"
SRC_URI = "ftp://space.mit.edu/pub/davis/slang/v2.2/slang-${PV}.tar.bz2 \
+ file://rpathfix.patch \
"
inherit autotools