aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/apache2
diff options
context:
space:
mode:
authorFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2009-12-12 21:15:03 +0100
committerFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2009-12-12 21:15:03 +0100
commit88ecddab105e8d1743d4fb73f4917522dc30f7ef (patch)
tree1c66480ac169d9a27aa84c57af115bd20d16bf66 /recipes/apache2
parent44ee7a093f410a30a1ec9ed9e809826a49191998 (diff)
downloadopenembedded-88ecddab105e8d1743d4fb73f4917522dc30f7ef.tar.gz
openembedded-88ecddab105e8d1743d4fb73f4917522dc30f7ef.tar.bz2
openembedded-88ecddab105e8d1743d4fb73f4917522dc30f7ef.zip
apache2: use libprce i.s.o own one
Diffstat (limited to 'recipes/apache2')
-rw-r--r--recipes/apache2/apache2-native_2.2.14.bb1
-rw-r--r--recipes/apache2/apache2_2.2.14.bb4
2 files changed, 2 insertions, 3 deletions
diff --git a/recipes/apache2/apache2-native_2.2.14.bb b/recipes/apache2/apache2-native_2.2.14.bb
index 460c3fdf9d..efa10f74d9 100644
--- a/recipes/apache2/apache2-native_2.2.14.bb
+++ b/recipes/apache2/apache2-native_2.2.14.bb
@@ -14,7 +14,6 @@ do_configure () {
do_stage () {
install -d ${STAGING_BINDIR_NATIVE}
- cp srclib/pcre/dftables ${STAGING_BINDIR_NATIVE}
cp server/gen_test_char ${STAGING_BINDIR_NATIVE}
cp srclib/apr/apr-1-config ${STAGING_BINDIR_NATIVE}
cp srclib/apr-util/apu-1-config ${STAGING_BINDIR_NATIVE}
diff --git a/recipes/apache2/apache2_2.2.14.bb b/recipes/apache2/apache2_2.2.14.bb
index 8990d53050..4ad77438ef 100644
--- a/recipes/apache2/apache2_2.2.14.bb
+++ b/recipes/apache2/apache2_2.2.14.bb
@@ -3,10 +3,9 @@ DESCRIPTION = "The apache v2 web server"
DEPENDS = "apache2-native openssl expat pcre"
RDEPENDS += "openssl"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://apache.mirrors.tds.net/httpd/httpd-${PV}.tar.bz2 \
- file://dftables-makefile-patch;patch=1 \
file://apr-sockets-patch;patch=1 \
file://configure-patch;patch=1 \
file://server-makefile-patch;patch=1 \
@@ -74,6 +73,7 @@ CFLAGS_prepend = "-I${STAGING_INCDIR}/openssl "
EXTRA_OECONF = "--enable-ssl \
--with-ssl=${STAGING_LIBDIR}/.. \
--with-expat=${STAGING_LIBDIR}/.. \
+ --with-pcre=${STAGING_LIBDIR}/.. \
--enable-info \
--enable-rewrite \
--with-dbm=sdbm \