summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorZheng Junling <zhengjunling@huawei.com>2014-08-01 12:10:46 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-06 10:23:38 +0100
commita350f26ca55b5511703cc911d541fd433e403a4e (patch)
treeccb5ea541866d646d1ab9f01348736d001a5675c /meta
parentdf3d7de667d4bfae8e6501402f1151b8307994cb (diff)
downloadpoky-a350f26ca55b5511703cc911d541fd433e403a4e.tar.gz
slang 2.2.4: fix the iconv existence checking
When checking whether there is iconv, the configure file always check the host env. Now we make it working properly by adding correct prefix for cross- compiling environment. (From OE-Core rev: ac588cc63315e4cb4ec84a1de87533e61d2dc6b6) Signed-off-by: Zheng Junling <zhengjunling@huawei.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/slang/slang/slang-fix-the-iconv-existence-checking.patch116
-rw-r--r--meta/recipes-extended/slang/slang_2.2.4.bb1
2 files changed, 117 insertions, 0 deletions
diff --git a/meta/recipes-extended/slang/slang/slang-fix-the-iconv-existence-checking.patch b/meta/recipes-extended/slang/slang/slang-fix-the-iconv-existence-checking.patch
new file mode 100644
index 0000000000..958fe983c5
--- /dev/null
+++ b/meta/recipes-extended/slang/slang/slang-fix-the-iconv-existence-checking.patch
@@ -0,0 +1,116 @@
1From 4588f4a0287787788eb86fb16f326cbaa7454e1d Mon Sep 17 00:00:00 2001
2From: Zheng Junling <zhengjunling@huawei.com>
3Date: Mon, 16 Jun 2014 12:51:25 +0000
4Subject: [PATCH] slang: fix the iconv existence checking
5
6When checking whether there is iconv, the configure file always check
7the host env.
8
9Now we make it working properly by adding correct prefix for cross-
10compiling environment.
11
12When enabling iconv-module, we see a QA warning because rpaths hardcoded
13into the build. And rpaths are not needed, so let's turn this off.
14
15This patch is generated by referencing the existing "fix-check-pcre"
16patch.
17
18Upstream-Status: Inappropriate
19
20Signed-off-by: Zheng Junling <zhengjunling@huawei.com>
21---
22 configure | 60 ++++++------------------------------------------------------
23 1 file changed, 6 insertions(+), 54 deletions(-)
24
25diff --git a/configure b/configure
26index 7a96256..91632f3 100755
27--- a/configure
28+++ b/configure
29@@ -7909,6 +7909,7 @@ $as_echo_n "checking for the iconv library and header files ... " >&6; }
30 /usr/include/iconv,/usr/lib \
31 /usr/iconv/include,/usr/iconv/lib \
32 /usr/include,/usr/lib \
33+ /usr/include,/usr/lib64 \
34 /opt/include/iconv,/opt/lib \
35 /opt/iconv/include,/opt/iconv/lib \
36 /opt/include,/opt/lib"
37@@ -7939,14 +7940,14 @@ $as_echo_n "checking for the iconv library and header files ... " >&6; }
38 xincdir=`echo $include_and_lib | tr ',' ' ' | awk '{print $1}'`
39 xlibdir=`echo $include_and_lib | tr ',' ' ' | awk '{print $2}'`
40 found=0
41- if test -r $xincdir/$xincfile
42+ if test -r $PKG_CONFIG_SYSROOT_DIR/$xincdir/$xincfile
43 then
44 for E in $exts
45 do
46- if test -r "$xlibdir/$xlibfile.$E"
47+ if test -r "$PKG_CONFIG_SYSROOT_DIR/$xlibdir/$xlibfile.$E"
48 then
49- jd_iconv_include_dir="$xincdir"
50- jd_iconv_library_dir="$xlibdir"
51+ jd_iconv_include_dir="$PKG_CONFIG_SYSROOT_DIR/$xincdir"
52+ jd_iconv_library_dir="$PKG_CONFIG_SYSROOT_DIR/$xlibdir"
53 jd_with_iconv_library="yes"
54 found=1
55 break
56@@ -7972,56 +7973,7 @@ $as_echo "yes: $jd_iconv_library_dir and $jd_iconv_include_dir" >&6; }
57 then
58 ICONV_LIB=""
59 else
60-
61-if test "X$jd_iconv_library_dir" != "X"
62-then
63- if test "X$RPATH" = "X"
64- then
65-
66-case "$host_os" in
67- *linux*|*solaris* )
68- if test "X$GCC" = Xyes
69- then
70- if test "X$ac_R_nospace" = "Xno"
71- then
72- RPATH="-Wl,-R,"
73- else
74- RPATH="-Wl,-R"
75- fi
76- else
77- if test "X$ac_R_nospace" = "Xno"
78- then
79- RPATH="-R "
80- else
81- RPATH="-R"
82- fi
83- fi
84- ;;
85- *osf*|*openbsd*)
86- if test "X$GCC" = Xyes
87- then
88- RPATH="-Wl,-rpath,"
89- else
90- RPATH="-rpath "
91- fi
92- ;;
93- *netbsd*)
94- if test "X$GCC" = Xyes
95- then
96- RPATH="-Wl,-R"
97- fi
98- ;;
99-esac
100-
101- if test "X$RPATH" != "X"
102- then
103- RPATH="$RPATH$jd_iconv_library_dir"
104- fi
105- else
106- RPATH="$RPATH:$jd_iconv_library_dir"
107- fi
108-fi
109-
110+ RPATH=""
111 fi
112
113 ICONV_INC=-I$jd_iconv_include_dir
114--
1151.8.3.4
116
diff --git a/meta/recipes-extended/slang/slang_2.2.4.bb b/meta/recipes-extended/slang/slang_2.2.4.bb
index 90ed2d0a47..f3003c9f08 100644
--- a/meta/recipes-extended/slang/slang_2.2.4.bb
+++ b/meta/recipes-extended/slang/slang_2.2.4.bb
@@ -21,6 +21,7 @@ SRC_URI = "ftp://space.mit.edu/pub/davis/slang/v2.2/slang-${PV}.tar.bz2 \
21 file://fix-check-pcre.patch \ 21 file://fix-check-pcre.patch \
22 file://change-char-type-to-signed-char-in-macros.patch \ 22 file://change-char-type-to-signed-char-in-macros.patch \
23 file://sprintf-bug-concerning-8-bit-characters.patch \ 23 file://sprintf-bug-concerning-8-bit-characters.patch \
24 file://slang-fix-the-iconv-existence-checking.patch \
24 " 25 "
25 26
26inherit autotools-brokensep 27inherit autotools-brokensep