summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/slang/slang/fix-check-pcre.patch108
-rw-r--r--meta/recipes-extended/slang/slang_2.2.4.bb3
2 files changed, 110 insertions, 1 deletions
diff --git a/meta/recipes-extended/slang/slang/fix-check-pcre.patch b/meta/recipes-extended/slang/slang/fix-check-pcre.patch
new file mode 100644
index 0000000000..0c1553a661
--- /dev/null
+++ b/meta/recipes-extended/slang/slang/fix-check-pcre.patch
@@ -0,0 +1,108 @@
1fix the pcre existence checking
2
3when check if there is pcre, the configure file always check
4the host dir. now we make it work by adding correct prefix for
5cross-compile environment.
6
7When enable pcre-module, we see a QA warning because rpaths
8hardcoded into the build, rpaths are not needed, so lets turn
9this off.
10
11Upstream-Status: Inappropriate
12Signed-off-by: Roy.Li <rongqing.li@windriver.com>
13---
14 configure | 60 ++++++------------------------------------------------------
15 1 files changed, 6 insertions(+), 54 deletions(-)
16
17diff --git a/configure b/configure
18index 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--
1071.7.4.1
108
diff --git a/meta/recipes-extended/slang/slang_2.2.4.bb b/meta/recipes-extended/slang/slang_2.2.4.bb
index 72dd99fb76..7082611fbe 100644
--- a/meta/recipes-extended/slang/slang_2.2.4.bb
+++ b/meta/recipes-extended/slang/slang_2.2.4.bb
@@ -10,7 +10,7 @@ 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 = "r9" 13PR = "r10"
14 14
15LICENSE = "GPLv2" 15LICENSE = "GPLv2"
16LIC_FILES_CHKSUM = "file://COPYING;md5=a52a18a472d4f7e45479b06563717c02" 16LIC_FILES_CHKSUM = "file://COPYING;md5=a52a18a472d4f7e45479b06563717c02"
@@ -18,6 +18,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a52a18a472d4f7e45479b06563717c02"
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 file://rpathfix.patch \
21 file://fix-check-pcre.patch \
21 " 22 "
22SRC_URI_append_arm = " file://change-char-type-to-signed-char-in-macros.patch" 23SRC_URI_append_arm = " file://change-char-type-to-signed-char-in-macros.patch"
23 24