diff options
Diffstat (limited to 'meta/recipes-extended/slang/slang/slang-fix-the-iconv-existence-checking.patch')
-rw-r--r-- | meta/recipes-extended/slang/slang/slang-fix-the-iconv-existence-checking.patch | 31 |
1 files changed, 20 insertions, 11 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 index 958fe983c5..850551ef0a 100644 --- 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 | |||
@@ -19,14 +19,14 @@ Upstream-Status: Inappropriate | |||
19 | 19 | ||
20 | Signed-off-by: Zheng Junling <zhengjunling@huawei.com> | 20 | Signed-off-by: Zheng Junling <zhengjunling@huawei.com> |
21 | --- | 21 | --- |
22 | configure | 60 ++++++------------------------------------------------------ | 22 | configure | 72 +++++--------------------------------------------------------- |
23 | 1 file changed, 6 insertions(+), 54 deletions(-) | 23 | 1 file changed, 6 insertions(+), 66 deletions(-) |
24 | 24 | ||
25 | diff --git a/configure b/configure | 25 | diff --git a/configure b/configure |
26 | index 7a96256..91632f3 100755 | 26 | index fa395ff..7fa769c 100755 |
27 | --- a/configure | 27 | --- a/configure |
28 | +++ b/configure | 28 | +++ b/configure |
29 | @@ -7909,6 +7909,7 @@ $as_echo_n "checking for the iconv library and header files ... " >&6; } | 29 | @@ -8259,6 +8259,7 @@ $as_echo_n "checking for the iconv library and header files ... " >&6; } |
30 | /usr/include/iconv,/usr/lib \ | 30 | /usr/include/iconv,/usr/lib \ |
31 | /usr/iconv/include,/usr/iconv/lib \ | 31 | /usr/iconv/include,/usr/iconv/lib \ |
32 | /usr/include,/usr/lib \ | 32 | /usr/include,/usr/lib \ |
@@ -34,7 +34,7 @@ index 7a96256..91632f3 100755 | |||
34 | /opt/include/iconv,/opt/lib \ | 34 | /opt/include/iconv,/opt/lib \ |
35 | /opt/iconv/include,/opt/iconv/lib \ | 35 | /opt/iconv/include,/opt/iconv/lib \ |
36 | /opt/include,/opt/lib" | 36 | /opt/include,/opt/lib" |
37 | @@ -7939,14 +7940,14 @@ $as_echo_n "checking for the iconv library and header files ... " >&6; } | 37 | @@ -8289,14 +8290,14 @@ $as_echo_n "checking for the iconv library and header files ... " >&6; } |
38 | xincdir=`echo $include_and_lib | tr ',' ' ' | awk '{print $1}'` | 38 | xincdir=`echo $include_and_lib | tr ',' ' ' | awk '{print $1}'` |
39 | xlibdir=`echo $include_and_lib | tr ',' ' ' | awk '{print $2}'` | 39 | xlibdir=`echo $include_and_lib | tr ',' ' ' | awk '{print $2}'` |
40 | found=0 | 40 | found=0 |
@@ -53,7 +53,7 @@ index 7a96256..91632f3 100755 | |||
53 | jd_with_iconv_library="yes" | 53 | jd_with_iconv_library="yes" |
54 | found=1 | 54 | found=1 |
55 | break | 55 | break |
56 | @@ -7972,56 +7973,7 @@ $as_echo "yes: $jd_iconv_library_dir and $jd_iconv_include_dir" >&6; } | 56 | @@ -8201,68 +8201,7 @@ $as_echo "yes: $jd_iconv_library_dir and $jd_iconv_include_dir" >&6; } |
57 | then | 57 | then |
58 | ICONV_LIB="" | 58 | ICONV_LIB="" |
59 | else | 59 | else |
@@ -82,7 +82,7 @@ index 7a96256..91632f3 100755 | |||
82 | - fi | 82 | - fi |
83 | - fi | 83 | - fi |
84 | - ;; | 84 | - ;; |
85 | - *osf*|*openbsd*) | 85 | - *osf*|*openbsd*|*freebsd*) |
86 | - if test "X$GCC" = Xyes | 86 | - if test "X$GCC" = Xyes |
87 | - then | 87 | - then |
88 | - RPATH="-Wl,-rpath," | 88 | - RPATH="-Wl,-rpath," |
@@ -103,7 +103,19 @@ index 7a96256..91632f3 100755 | |||
103 | - RPATH="$RPATH$jd_iconv_library_dir" | 103 | - RPATH="$RPATH$jd_iconv_library_dir" |
104 | - fi | 104 | - fi |
105 | - else | 105 | - else |
106 | - RPATH="$RPATH:$jd_iconv_library_dir" | 106 | - _already_there=0 |
107 | - for X in `echo $RPATH | sed 's/:/ /g'` | ||
108 | - do | ||
109 | - if test "$X" = "$jd_iconv_library_dir" | ||
110 | - then | ||
111 | - _already_there=1 | ||
112 | - break | ||
113 | - fi | ||
114 | - done | ||
115 | - if test $_already_there = 0 | ||
116 | - then | ||
117 | - RPATH="$RPATH:$jd_iconv_library_dir" | ||
118 | - fi | ||
107 | - fi | 119 | - fi |
108 | -fi | 120 | -fi |
109 | - | 121 | - |
@@ -111,6 +123,3 @@ index 7a96256..91632f3 100755 | |||
111 | fi | 123 | fi |
112 | 124 | ||
113 | ICONV_INC=-I$jd_iconv_include_dir | 125 | ICONV_INC=-I$jd_iconv_include_dir |
114 | -- | ||
115 | 1.8.3.4 | ||
116 | |||