diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2009-12-15 14:46:11 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2009-12-15 14:46:11 +0100 |
| commit | 58884fc059504abafc9126613a7049464ba701e7 (patch) | |
| tree | 61030608675a792923aff657516c48a6a2048693 /recipes/apache2/apache2_2.2.14.bb | |
| parent | 75820363234db9d6335997658c6f606654d1588c (diff) | |
| parent | 47d6cb217ff161738488f4f82af9dd8f8c616ce0 (diff) | |
| download | openembedded-58884fc059504abafc9126613a7049464ba701e7.tar.gz | |
Merge commit 'origin/org.openembedded.dev' into martin_jansa/xorg-7.5
Conflicts:
conf/distro/include/angstrom-2008-preferred-versions.inc
Diffstat (limited to 'recipes/apache2/apache2_2.2.14.bb')
| -rw-r--r-- | recipes/apache2/apache2_2.2.14.bb | 4 |
1 files changed, 2 insertions, 2 deletions
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 \ |