Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | fix the pcre existence checking |
| 2 | |
| 3 | when check if there is pcre, the configure file always check |
| 4 | the host dir. now we make it work by adding correct prefix for |
| 5 | cross-compile environment. |
| 6 | |
| 7 | When enable pcre-module, we see a QA warning because rpaths |
| 8 | hardcoded into the build, rpaths are not needed, so lets turn |
| 9 | this off. |
| 10 | |
| 11 | Upstream-Status: Inappropriate |
| 12 | Signed-off-by: Roy.Li <rongqing.li@windriver.com> |
| 13 | --- |
| 14 | configure | 60 ++++++------------------------------------------------------ |
| 15 | 1 files changed, 6 insertions(+), 54 deletions(-) |
| 16 | |
| 17 | diff --git a/configure b/configure |
| 18 | index f1586c3..d22814f 100755 |
| 19 | --- a/configure |
| 20 | +++ b/configure |
| 21 | @@ -6991,6 +6991,7 @@ $as_echo_n "checking for the pcre library and header files ... " >&6; } |
| 22 | /usr/include/pcre,/usr/lib \ |
| 23 | /usr/pcre/include,/usr/pcre/lib \ |
| 24 | /usr/include,/usr/lib \ |
| 25 | + /usr/include,/usr/lib64 \ |
| 26 | /opt/include/pcre,/opt/lib \ |
| 27 | /opt/pcre/include,/opt/pcre/lib \ |
| 28 | /opt/include,/opt/lib" |
| 29 | @@ -7021,14 +7022,14 @@ $as_echo_n "checking for the pcre library and header files ... " >&6; } |
| 30 | xincdir=`echo $include_and_lib | tr ',' ' ' | awk '{print $1}'` |
| 31 | xlibdir=`echo $include_and_lib | tr ',' ' ' | awk '{print $2}'` |
| 32 | found=0 |
| 33 | - if test -r $xincdir/$xincfile |
| 34 | + if test -r $PKG_CONFIG_SYSROOT_DIR/$xincdir/$xincfile |
| 35 | then |
| 36 | for E in $exts |
| 37 | do |
| 38 | - if test -r "$xlibdir/$xlibfile.$E" |
| 39 | + if test -r "$PKG_CONFIG_SYSROOT_DIR/$xlibdir/$xlibfile.$E" |
| 40 | then |
| 41 | - jd_pcre_include_dir="$xincdir" |
| 42 | - jd_pcre_library_dir="$xlibdir" |
| 43 | + jd_pcre_include_dir="$PKG_CONFIG_SYSROOT_DIR/$xincdir" |
| 44 | + jd_pcre_library_dir="$PKG_CONFIG_SYSROOT_DIR/$xlibdir" |
| 45 | jd_with_pcre_library="yes" |
| 46 | found=1 |
| 47 | break |
| 48 | @@ -7054,56 +7055,7 @@ $as_echo "yes: $jd_pcre_library_dir and $jd_pcre_include_dir" >&6; } |
| 49 | then |
| 50 | PCRE_LIB="" |
| 51 | else |
| 52 | - |
| 53 | -if test "X$jd_pcre_library_dir" != "X" |
| 54 | -then |
| 55 | - if test "X$RPATH" = "X" |
| 56 | - then |
| 57 | - |
| 58 | -case "$host_os" in |
| 59 | - *linux*|*solaris* ) |
| 60 | - if test "X$GCC" = Xyes |
| 61 | - then |
| 62 | - if test "X$ac_R_nospace" = "Xno" |
| 63 | - then |
| 64 | - RPATH="-Wl,-R," |
| 65 | - else |
| 66 | - RPATH="-Wl,-R" |
| 67 | - fi |
| 68 | - else |
| 69 | - if test "X$ac_R_nospace" = "Xno" |
| 70 | - then |
| 71 | - RPATH="-R " |
| 72 | - else |
| 73 | - RPATH="-R" |
| 74 | - fi |
| 75 | - fi |
| 76 | - ;; |
| 77 | - *osf*|*openbsd*) |
| 78 | - if test "X$GCC" = Xyes |
| 79 | - then |
| 80 | - RPATH="-Wl,-rpath," |
| 81 | - else |
| 82 | - RPATH="-rpath " |
| 83 | - fi |
| 84 | - ;; |
| 85 | - *netbsd*) |
| 86 | - if test "X$GCC" = Xyes |
| 87 | - then |
| 88 | - RPATH="-Wl,-R" |
| 89 | - fi |
| 90 | - ;; |
| 91 | -esac |
| 92 | - |
| 93 | - if test "X$RPATH" != "X" |
| 94 | - then |
| 95 | - RPATH="$RPATH$jd_pcre_library_dir" |
| 96 | - fi |
| 97 | - else |
| 98 | - RPATH="$RPATH:$jd_pcre_library_dir" |
| 99 | - fi |
| 100 | -fi |
| 101 | - |
| 102 | + RPATH="" |
| 103 | fi |
| 104 | |
| 105 | PCRE_INC=-I$jd_pcre_include_dir |
| 106 | -- |
| 107 | 1.7.4.1 |
| 108 | |