summaryrefslogtreecommitdiffstats
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:11:40 +0000
commit8bae18bb358755131f13865abb279ac687a03848 (patch)
tree8f94189b52a8314643a76154e9c91deb26b22372 /meta/recipes-extended/slang
parent50466b6cc3b77913e6528c62b9d63da4e2dbf4a3 (diff)
downloadpoky-8bae18bb358755131f13865abb279ac687a03848.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 (From OE-Core rev: b055075ba5b9ff5250bc66be1cd8b222bdb86161) 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 @@
1Without this patch we see rpaths hardcoded into the build which results in QA
2warnings. These rpaths are not needed so lets turn this off.
3
4Upsteam-Status: Inappropriate
5(but could be turned into a proper configure option)
6
7RP 2012/03/14
8
9Index: slang-2.2.4/configure
10===================================================================
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
13@@ -6081,56 +6081,7 @@
14 ELF_CFLAGS="$ELF_CFLAGS $IEEE_CFLAGS"
15 CFLAGS="$CFLAGS $IEEE_CFLAGS"
16
17-
18-if test "X$libdir" != "X"
19-then
20- if test "X$RPATH" = "X"
21- then
22-
23-case "$host_os" in
24- *linux*|*solaris* )
25- if test "X$GCC" = Xyes
26- then
27- if test "X$ac_R_nospace" = "Xno"
28- then
29- RPATH="-Wl,-R,"
30- else
31- RPATH="-Wl,-R"
32- fi
33- else
34- if test "X$ac_R_nospace" = "Xno"
35- then
36- RPATH="-R "
37- else
38- RPATH="-R"
39- fi
40- fi
41- ;;
42- *osf*|*openbsd*)
43- if test "X$GCC" = Xyes
44- then
45- RPATH="-Wl,-rpath,"
46- else
47- RPATH="-rpath "
48- fi
49- ;;
50- *netbsd*)
51- if test "X$GCC" = Xyes
52- then
53- RPATH="-Wl,-R"
54- fi
55- ;;
56-esac
57-
58- if test "X$RPATH" != "X"
59- then
60- RPATH="$RPATH$libdir"
61- fi
62- else
63- RPATH="$RPATH:$libdir"
64- fi
65-fi
66-
67+RPATH=""
68
69 # The cast to long int works around a bug in the HP C Compiler
70 # 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."
10HOMEPAGE = "http://www.jedsoft.org/slang/" 10HOMEPAGE = "http://www.jedsoft.org/slang/"
11SECTION = "libs" 11SECTION = "libs"
12DEPENDS = "pcre" 12DEPENDS = "pcre"
13PR = "r6" 13PR = "r7"
14 14
15LICENSE = "GPLv2" 15LICENSE = "GPLv2"
16LIC_FILES_CHKSUM = "file://COPYING;md5=a52a18a472d4f7e45479b06563717c02" 16LIC_FILES_CHKSUM = "file://COPYING;md5=a52a18a472d4f7e45479b06563717c02"
17 17
18 18
19SRC_URI = "ftp://space.mit.edu/pub/davis/slang/v2.2/slang-${PV}.tar.bz2 \ 19SRC_URI = "ftp://space.mit.edu/pub/davis/slang/v2.2/slang-${PV}.tar.bz2 \
20 file://rpathfix.patch \
20 " 21 "
21 22
22inherit autotools 23inherit autotools