diff options
Diffstat (limited to 'meta/recipes-extended/slang/slang/fix-check-pcre.patch')
-rw-r--r-- | meta/recipes-extended/slang/slang/fix-check-pcre.patch | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/meta/recipes-extended/slang/slang/fix-check-pcre.patch b/meta/recipes-extended/slang/slang/fix-check-pcre.patch index 0c1553a661..a0ec0ff658 100644 --- a/meta/recipes-extended/slang/slang/fix-check-pcre.patch +++ b/meta/recipes-extended/slang/slang/fix-check-pcre.patch | |||
@@ -11,14 +11,13 @@ this off. | |||
11 | Upstream-Status: Inappropriate | 11 | Upstream-Status: Inappropriate |
12 | Signed-off-by: Roy.Li <rongqing.li@windriver.com> | 12 | Signed-off-by: Roy.Li <rongqing.li@windriver.com> |
13 | --- | 13 | --- |
14 | configure | 60 ++++++------------------------------------------------------ | 14 | configure | 72 +++++--------------------------------------------------------- |
15 | 1 files changed, 6 insertions(+), 54 deletions(-) | 15 | 1 file changed, 6 insertions(+), 66 deletions(-) |
16 | 16 | ||
17 | diff --git a/configure b/configure | 17 | diff --git a/configure b/configure |
18 | index f1586c3..d22814f 100755 | ||
19 | --- a/configure | 18 | --- a/configure |
20 | +++ b/configure | 19 | +++ b/configure |
21 | @@ -6991,6 +6991,7 @@ $as_echo_n "checking for the pcre library and header files ... " >&6; } | 20 | @@ -7191,6 +7191,7 @@ $as_echo_n "checking for the pcre library and header files ... " >&6; } |
22 | /usr/include/pcre,/usr/lib \ | 21 | /usr/include/pcre,/usr/lib \ |
23 | /usr/pcre/include,/usr/pcre/lib \ | 22 | /usr/pcre/include,/usr/pcre/lib \ |
24 | /usr/include,/usr/lib \ | 23 | /usr/include,/usr/lib \ |
@@ -26,7 +25,7 @@ index f1586c3..d22814f 100755 | |||
26 | /opt/include/pcre,/opt/lib \ | 25 | /opt/include/pcre,/opt/lib \ |
27 | /opt/pcre/include,/opt/pcre/lib \ | 26 | /opt/pcre/include,/opt/pcre/lib \ |
28 | /opt/include,/opt/lib" | 27 | /opt/include,/opt/lib" |
29 | @@ -7021,14 +7022,14 @@ $as_echo_n "checking for the pcre library and header files ... " >&6; } | 28 | @@ -7221,14 +7222,14 @@ $as_echo_n "checking for the pcre library and header files ... " >&6; } |
30 | xincdir=`echo $include_and_lib | tr ',' ' ' | awk '{print $1}'` | 29 | xincdir=`echo $include_and_lib | tr ',' ' ' | awk '{print $1}'` |
31 | xlibdir=`echo $include_and_lib | tr ',' ' ' | awk '{print $2}'` | 30 | xlibdir=`echo $include_and_lib | tr ',' ' ' | awk '{print $2}'` |
32 | found=0 | 31 | found=0 |
@@ -45,7 +44,7 @@ index f1586c3..d22814f 100755 | |||
45 | jd_with_pcre_library="yes" | 44 | jd_with_pcre_library="yes" |
46 | found=1 | 45 | found=1 |
47 | break | 46 | break |
48 | @@ -7054,56 +7055,7 @@ $as_echo "yes: $jd_pcre_library_dir and $jd_pcre_include_dir" >&6; } | 47 | @@ -7255,68 +7255,7 @@ $as_echo "yes: $jd_pcre_library_dir and $jd_pcre_include_dir" >&6; } |
49 | then | 48 | then |
50 | PCRE_LIB="" | 49 | PCRE_LIB="" |
51 | else | 50 | else |
@@ -74,7 +73,7 @@ index f1586c3..d22814f 100755 | |||
74 | - fi | 73 | - fi |
75 | - fi | 74 | - fi |
76 | - ;; | 75 | - ;; |
77 | - *osf*|*openbsd*) | 76 | - *osf*|*openbsd*|*freebsd*) |
78 | - if test "X$GCC" = Xyes | 77 | - if test "X$GCC" = Xyes |
79 | - then | 78 | - then |
80 | - RPATH="-Wl,-rpath," | 79 | - RPATH="-Wl,-rpath," |
@@ -95,7 +94,19 @@ index f1586c3..d22814f 100755 | |||
95 | - RPATH="$RPATH$jd_pcre_library_dir" | 94 | - RPATH="$RPATH$jd_pcre_library_dir" |
96 | - fi | 95 | - fi |
97 | - else | 96 | - else |
98 | - RPATH="$RPATH:$jd_pcre_library_dir" | 97 | - _already_there=0 |
98 | - for X in `echo $RPATH | sed 's/:/ /g'` | ||
99 | - do | ||
100 | - if test "$X" = "$jd_pcre_library_dir" | ||
101 | - then | ||
102 | - _already_there=1 | ||
103 | - break | ||
104 | - fi | ||
105 | - done | ||
106 | - if test $_already_there = 0 | ||
107 | - then | ||
108 | - RPATH="$RPATH:$jd_pcre_library_dir" | ||
109 | - fi | ||
99 | - fi | 110 | - fi |
100 | -fi | 111 | -fi |
101 | - | 112 | - |
@@ -103,6 +114,3 @@ index f1586c3..d22814f 100755 | |||
103 | fi | 114 | fi |
104 | 115 | ||
105 | PCRE_INC=-I$jd_pcre_include_dir | 116 | PCRE_INC=-I$jd_pcre_include_dir |
106 | -- | ||
107 | 1.7.4.1 | ||
108 | |||