diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-12-16 09:45:29 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-12-16 09:45:29 +0100 |
| commit | 19d4137e9dcebd905b830e45fa05a082785f66f2 (patch) | |
| tree | 09b17088223b8192507c25f718764d6d8624f523 | |
| parent | 6f6a8710f9e4959cacf829b32cb76b21df65842f (diff) | |
apache2-native: fix staging of pcre helper binaries
| -rw-r--r-- | packages/apache2/apache2-native_2.2.3.bb | 22 | ||||
| -rw-r--r-- | packages/apache2/apache2_2.2.3.bb | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/packages/apache2/apache2-native_2.2.3.bb b/packages/apache2/apache2-native_2.2.3.bb index 28e1fe6a18..f58af2a640 100644 --- a/packages/apache2/apache2-native_2.2.3.bb +++ b/packages/apache2/apache2-native_2.2.3.bb @@ -3,7 +3,7 @@ DEPENDS = "expat pcre" inherit cross -PR ="r7" +PR ="r8" SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2" S = "${WORKDIR}/httpd-${PV}" @@ -13,13 +13,13 @@ do_configure () { } do_stage () { - install -d ${STAGING_BINDIR} - cp srclib/pcre/dftables ${STAGING_BINDIR} - cp server/gen_test_char ${STAGING_BINDIR} - cp srclib/apr/apr-1-config ${STAGING_BINDIR} - cp srclib/apr-util/apu-1-config ${STAGING_BINDIR} - cp support/apxs ${STAGING_BINDIR} - chmod 755 ${STAGING_BINDIR}/apxs + 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} + cp support/apxs ${STAGING_BINDIR_NATIVE} + chmod 755 ${STAGING_BINDIR_NATIVE}/apxs mkdir -p ${STAGING_DIR}/build cp build/*.mk ${STAGING_DIR}/build cat build/config_vars.mk | \ @@ -28,7 +28,7 @@ do_stage () { sed -e 's,staging/bin,staging/${HOST_SYS}/bin,' > \ ${STAGING_DIR}/build/config_vars.mk cp build/instdso.sh ${STAGING_DIR}/build - cp .libs/httpd ${STAGING_BINDIR} + cp .libs/httpd ${STAGING_BINDIR_NATIVE} (cd srclib/apr/.libs; tar -cf - libapr-*.so* ) | (cd ${STAGING_LIBDIR}; tar -xf - ) @@ -40,6 +40,6 @@ do_stage () { cp os/unix/os.h ${STAGING_INCDIR}/apache2 cp os/unix/unixd.h ${STAGING_INCDIR}/apache2 - cp support/envvars-std ${STAGING_BINDIR}/envvars - chmod 755 ${STAGING_BINDIR}/envvars + cp support/envvars-std ${STAGING_BINDIR_NATIVE}/envvars + chmod 755 ${STAGING_BINDIR_NATIVE}/envvars } diff --git a/packages/apache2/apache2_2.2.3.bb b/packages/apache2/apache2_2.2.3.bb index b6ec8f81f9..ba995ea6d7 100644 --- a/packages/apache2/apache2_2.2.3.bb +++ b/packages/apache2/apache2_2.2.3.bb @@ -3,7 +3,7 @@ DESCRIPTION = "The apache v2 web server" DEPENDS = "apache2-native openssl expat pcre" RDEPENDS += "openssl" -PR = "r5" +PR = "r6" SRC_URI = "http://apache.mirrors.tds.net/httpd/httpd-2.2.3.tar.bz2 \ file://dftables-makefile-patch;patch=1 \ |