diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-12-13 16:29:16 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-12-13 16:29:16 +0100 |
| commit | 5b4ef2a7e318a04fbbf523cd62a570cdb8a41de5 (patch) | |
| tree | ebd2e7b645b4de0215be36f6ccf7c12a7d7e3964 /recipes/apache2 | |
| parent | 3516e365b5f29fb1c09e4a7351e92b6ceb250d72 (diff) | |
| parent | 5971f7fdc2c0098282880af56dbb6f775dd9dd93 (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/apache2')
| -rw-r--r-- | recipes/apache2/apache2-native_2.2.14.bb | 3 | ||||
| -rw-r--r-- | recipes/apache2/apache2_2.2.14.bb | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/recipes/apache2/apache2-native_2.2.14.bb b/recipes/apache2/apache2-native_2.2.14.bb index 460c3fdf9d..371bb49a88 100644 --- a/recipes/apache2/apache2-native_2.2.14.bb +++ b/recipes/apache2/apache2-native_2.2.14.bb @@ -3,7 +3,7 @@ DEPENDS = "expat pcre" inherit native -PR ="r0" +PR ="r1" SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2" S = "${WORKDIR}/httpd-${PV}" @@ -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 \ |