diff options
| author | Luotao Fu <l.fu@pengutronix.de> | 2008-07-07 09:25:10 +0000 |
|---|---|---|
| committer | Luotao Fu <l.fu@pengutronix.de> | 2008-07-07 09:25:10 +0000 |
| commit | 2894956c2ad90fd9f25f1928cbd8203807c7b059 (patch) | |
| tree | bad8710871844d8026deb897f8d41992d202a89d | |
| parent | 9005e62d64fd7c9c1da6e88b9e02280c648798b3 (diff) | |
| download | ptxdist-2894956c2ad90fd9f25f1928cbd8203807c7b059.tar.gz ptxdist-2894956c2ad90fd9f25f1928cbd8203807c7b059.tar.xz | |
fixed pcre-config
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8613 33e552b5-05e3-0310-8538-816dae2090ed
| -rw-r--r-- | patches/pcre-7.7/generic/libpcre-7.7-pcre-config.in.diff | 40 | ||||
| -rw-r--r-- | patches/pcre-7.7/generic/series | 1 | ||||
| -rw-r--r-- | rules/libpcre.make | 11 |
3 files changed, 52 insertions, 0 deletions
diff --git a/patches/pcre-7.7/generic/libpcre-7.7-pcre-config.in.diff b/patches/pcre-7.7/generic/libpcre-7.7-pcre-config.in.diff new file mode 100644 index 00000000..1e9e9f24 --- /dev/null +++ b/patches/pcre-7.7/generic/libpcre-7.7-pcre-config.in.diff @@ -0,0 +1,40 @@ +--- + pcre-config.in | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +Index: pcre-config.in +=================================================================== +--- pcre-config.in.orig ++++ pcre-config.in +@@ -15,10 +15,10 @@ fi + libR= + case `uname -s` in + *SunOS*) +- libR=" -R@libdir@" ++ libR=" -R${SYSROOT}@libdir@" + ;; + *BSD*) +- libR=" -Wl,-R@libdir@" ++ libR=" -Wl,-R${SYSROOT}@libdir@" + ;; + esac + +@@ -50,15 +50,15 @@ while test $# -gt 0; do + ;; + --cflags | --cflags-posix) + if test @includedir@ != /usr/include ; then +- includes=-I@includedir@ ++ includes=-I${SYSROOT}@includedir@ + fi + echo $includes + ;; + --libs-posix) +- echo -L@libdir@$libR -lpcreposix -lpcre ++ echo -L${SYSROOT}@libdir@$libR -lpcreposix -lpcre + ;; + --libs) +- echo -L@libdir@$libR -lpcre ++ echo -L${SYSROOT}@libdir@$libR -lpcre + ;; + *) + echo "${usage}" 1>&2 diff --git a/patches/pcre-7.7/generic/series b/patches/pcre-7.7/generic/series new file mode 100644 index 00000000..6a81ca6f --- /dev/null +++ b/patches/pcre-7.7/generic/series @@ -0,0 +1 @@ +libpcre-7.7-pcre-config.in.diff -p0 diff --git a/rules/libpcre.make b/rules/libpcre.make index 9c70d045..b88811b6 100644 --- a/rules/libpcre.make +++ b/rules/libpcre.make @@ -50,6 +50,17 @@ LIBPCRE_ENV := $(CROSS_ENV) LIBPCRE_AUTOCONF := $(CROSS_AUTOCONF_USR) # ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- +$(STATEDIR)/libpcre.install: + @$(call targetinfo) + + cp $(LIBPCRE_DIR)/pcre-config $(PTXCONF_SYSROOT_CROSS)/bin/pcre-config + chmod a+x $(PTXCONF_SYSROOT_CROSS)/bin/pcre-config + + @$(call touch) + +# ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- |